Commit Graph

10892 Commits

Author SHA1 Message Date
Mel O'Hagan c860a75978 Use asterisk instead of null 2023-09-09 00:04:42 +01:00
Mel O'Hagan 1f4c608882 S3 upload field is now simple input 2023-09-08 23:59:25 +01:00
FlaminWrap 33be2d6c96 Fix #11353
Removes the slice as the v prefix has been removed

Addresses:
#11353
2023-09-08 21:28:25 +01:00
Andrew Kingston 32892b1ef9 Merge branch 'develop' into lab-theme-binding 2023-09-08 15:10:51 +01:00
Andrew Kingston 6785ec281b Merge branch 'develop' into cheeks-lab-day-portal-poc 2023-09-08 11:09:07 +01:00
Andrew Kingston bac5d52107 Add users table button explaining why it is readonly 2023-09-08 11:05:09 +01:00
Andrew Kingston 8375297f2d Make users table readonly and add WIP for button explaining change 2023-09-08 09:56:01 +01:00
Martin McKeaveney b748149068 fix for app backups not being shown 2023-09-07 19:06:58 +01:00
mike12345567 2b87514cf4 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-7449 2023-09-07 17:02:31 +01:00
mike12345567 662e8d9c31 Quick fix for disabling formula changing, swapping between static and dynamic can cause problems. 2023-09-07 17:02:11 +01:00
Adria Navarro 8781ca0be7 Remove cypress dependencies 2023-09-07 15:27:13 +02:00
Andrew Kingston f972aa340a Ensure invalid app IDs redirect properly without issues in portal 2023-09-06 16:22:47 +01:00
Andrew Kingston 3c3c4cf8b1 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-portal-poc 2023-09-06 14:27:43 +01:00
Andrew Kingston de948f6065 Only show edit button if user is a builder for this apps 2023-09-06 14:25:58 +01:00
Andrew Kingston fdfe09f8d0 Clean up and use existing components 2023-09-06 14:15:43 +01:00
Andrew Kingston dd8b89d4e0 Update side bar to use square styles in line with the builder 2023-09-06 13:14:35 +01:00
Andrew Kingston 6e4ce346cf Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-portal-poc 2023-09-06 11:36:09 +01:00
Andrew Kingston 256ee25609 Merge branch 'develop' into cheeks-fixes 2023-09-06 11:34:41 +01:00
mike12345567 259e739490 Merge branch 'develop' of github.com:Budibase/budibase into fix/relationship-toast 2023-09-06 10:10:07 +01:00
Dean 4a1e969b7c PR Feedback and fixes for the edit field popover 2023-09-06 09:09:43 +01:00
mike12345567 ad46ff6f8c Updating to accept action as an object specifier. 2023-09-05 19:33:43 +01:00
mike12345567 fef5c2a003 Quick fix for relationship toast. 2023-09-05 15:37:18 +01:00
mike12345567 5a1b67b830 Merge branch 'develop' of github.com:Budibase/budibase into merge-master-develop 2023-09-05 15:25:51 +01:00
mike12345567 83875cd2d6 Merge branch 'develop' of github.com:Budibase/budibase into merge-master-develop 2023-09-05 12:29:27 +01:00
mike12345567 d096f359d7 Revert "Revert "Merge branch 'develop' into master""
This reverts commit 3265042025.
2023-09-05 12:28:56 +01:00
Peter Clement 1997cb5d6b readibility update 2023-09-05 12:28:03 +01:00
Dean b923d24d56 Removed debugging console statement 2023-09-05 11:56:23 +01:00
Dean c6bd81ba21 Fix for datasource reset on formblock. Added 'resetOn' to the manifest to trigger a clear when the configured field is cleared 2023-09-05 11:40:52 +01:00
Peter Clement ff8ee8d987 Merge remote-tracking branch 'origin/develop' into fix/per-app-fixes 2023-09-05 10:37:57 +01:00
Peter Clement 9c30d79093 formatting 2023-09-05 10:13:23 +01:00
Peter Clement c16fd53b0a add developer label back and improve invite flow 2023-09-05 09:58:05 +01:00
Peter Clement 6d3a7727eb fixes for perr app builder and refactoring based on comments 2023-09-05 09:25:06 +01:00
Andrew Kingston 53987ca2df Upate search bar font 2023-09-05 07:45:22 +01:00
Andrew Kingston 2c425073c7 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-portal-poc 2023-09-04 16:10:39 +01:00
Adria Navarro d68d449f1f DRY 2023-09-04 12:11:59 +02:00
Peter Clement 24abd91600 Fix issue around adding of admin users 2023-09-04 09:37:10 +01:00
Peter Clement 190e29e043 fix issue with counting of groups and apps 2023-09-04 09:36:48 +01:00
Andrew Kingston cf33680b1e Fix crash when converting form fields with a schema that doesn't contain a certain field 2023-09-04 09:05:33 +01:00
Adria Navarro a1da8e495c Merge branch 'develop' into BUDI-7393/display_inheritance_permission 2023-09-04 09:53:34 +02:00
Andrew Kingston 401c12732f Fix datasource definitions to ensure they work with both tables and views, for both type datasource and type table, and fix bindings 2023-09-04 08:37:24 +01:00
Adria Navarro bb8aacd830 Improve messaging 2023-09-01 17:23:47 +02:00
Adria Navarro 0dc03abe5f Display dependant info 2023-09-01 17:03:33 +02:00
Andrew Kingston 3d7a2d4ba9 Ensure resourceId is specified when creating default table datasources 2023-09-01 11:49:46 +01:00
Adria Navarro 8c801f2bbe Handle disabled 2023-09-01 11:44:40 +02:00
Adria Navarro 5b7756936d Change api interfaces 2023-09-01 11:33:59 +02:00
Andrew Kingston d47bb4f191 Show tooltip when initially applying filters to a table 2023-09-01 10:07:37 +01:00
Adria Navarro 466f1e6132 Display inherit option 2023-09-01 10:52:06 +02:00
Andrew Kingston 0b7998f898 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-09-01 09:42:07 +01:00
Adria Navarro bdaf179f20 Remove placeholder 2023-09-01 10:16:49 +02:00
Adria Navarro 3192bbe4dd Clean 2023-09-01 09:56:12 +02:00
Dean cd30c45ca5 Fix for error seen when creating blank screen 2023-08-31 14:50:28 +01:00
Adria Navarro bbc484e2c4 Handle frontend levels 2023-08-31 13:00:51 +02:00
Andrew Kingston bc8ebc42f9 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-08-31 11:29:54 +01:00
Peter Clement 2360e5d8a5 Merge remote-tracking branch 'origin/develop' into feat/per-app-builder-fe 2023-08-31 11:07:39 +01:00
Peter Clement 33adc9960b more developer references removed 2023-08-31 11:01:24 +01:00
Peter Clement 61e2aad44b remove more reference of developer 2023-08-31 10:59:50 +01:00
Peter Clement ddf9e734f4 pr comments and bug fixes 2023-08-31 10:36:27 +01:00
Adria Navarro 566f9ecd22 Create remove permission js api 2023-08-31 10:53:25 +02:00
Adria Navarro d36c7d744f Rename 2023-08-31 10:24:52 +02:00
Dean 2f36b2f805 Ensure the default export value is only set once 2023-08-31 08:51:00 +01:00
Andrew Kingston 8c889b873c Filter out invalid fields from fieldconfiguration (we don't allow formula and nested JSON fields in forms) 2023-08-31 08:50:36 +01:00
Andrew Kingston 471a5838a3 Ensure null IDs are pruned from draggable list to avoid crashing 2023-08-31 08:50:06 +01:00
Dean 4d2f76e5be Fix for view export filtering and view tableblock exception 2023-08-31 08:42:31 +01:00
Peter Clement 7c8914207b fix invite user flow 2023-08-30 16:43:24 +01:00
Andrew Kingston 7a8d042256 Update px style to use spacing var 2023-08-30 16:00:16 +01:00
Andrew Kingston 7505eccbbc Use selected view table ID to check if a datasource contains the selected view V2 2023-08-30 15:44:30 +01:00
Andrew Kingston db28b29cf7 Prevent views with same name but different casing 2023-08-30 15:40:26 +01:00
Peter Clement 86c35a2266 add invite user button 2023-08-30 13:44:36 +01:00
Peter Clement adef9a17eb remove logs 2023-08-30 10:51:32 +01:00
Peter Clement 84571e36c2 use display to hide picker button instead of prop 2023-08-30 10:50:49 +01:00
Peter Clement 2aff73ac25 Update user pages to account for creator role 2023-08-30 10:50:19 +01:00
Dean eb6269a0bb Refactor theme binding into device databindings fn 2023-08-30 09:27:23 +01:00
Peter Clement 7dfc516758 Merge remote-tracking branch 'origin/develop' into feat/per-app-builder-fe 2023-08-30 09:06:13 +01:00
Dean f7d0f98a45 Merge remote-tracking branch 'origin/develop' into lab-theme-binding 2023-08-30 09:06:01 +01:00
Peter Clement 6bf343078c update role label to member 2023-08-30 09:05:58 +01:00
Andrew Kingston c2b6a7d016 Ensure grid metadata is saved when creating views, even if not yet associated with the table 2023-08-30 08:21:10 +01:00
Andrew Kingston 37158ea387 Merge branch 'develop' of github.com:Budibase/budibase into views-v2-frontend 2023-08-30 08:06:19 +01:00
Peter Clement b5a1c31034 more code tidy up 2023-08-29 22:07:55 +01:00
Peter Clement ac34f1129c code tidy up 2023-08-29 21:54:15 +01:00
Dean 3bdb1ea877 PR Feedback updates 2023-08-29 17:11:25 +01:00
Peter Clement f456210224 fix constants definition 2023-08-29 14:54:02 +01:00
Peter Clement a7241487fd use constants instead of hard coding: 2023-08-29 14:45:42 +01:00
Peter Clement 8b8bce186c builder side panel changes to support inviting creators 2023-08-29 14:41:56 +01:00
Adria Navarro 0fe02c189c Copy change 2023-08-29 15:41:31 +02:00
Martin McKeaveney 3265042025 Revert "Merge branch 'develop' into master"
This reverts commit 99adc2039b, reversing
changes made to fec20e526e.
2023-08-29 14:27:39 +01:00
Adria Navarro 12b869d7d1 Display required license 2023-08-29 12:47:15 +02:00
Adria Navarro ce11a5a852 Lock feature based on ff 2023-08-29 12:47:15 +02:00
Dean 5365de6a8d POC 2023-08-29 09:19:11 +01:00
Andrew Kingston 02d2f9d875 Remove more usage of accumulators because they're evil 2023-08-25 16:53:45 +01:00
Andrew Kingston 6c38eb5a4c Add back in auto focus behaviour to modals but disable it for screen creation 2023-08-25 16:45:41 +01:00
Andrew Kingston dcb6350339 Enable creating views for SQL tables 2023-08-25 15:21:59 +01:00
Dean ef6f8e2abf Lint fixes 2023-08-25 15:14:49 +01:00
Andrew Kingston 2bbdb5ce46 Fix prod bug where screens are not deleted when the backing table is 2023-08-25 12:29:32 +01:00
Andrew Kingston 22f34d83ee Update table deletion to properly delete screens 2023-08-25 12:21:19 +01:00
Andrew Kingston 09ad3e73ae Rewrite most of the screen creation code to account for views and clean up mess 2023-08-25 12:14:17 +01:00
Dean 13f6fed101 UX Enhancements and custom positioning behaviour for the popover 2023-08-25 11:19:28 +01:00
Peter Clement d2284c2f0a fix sorting of users and groups 2023-08-25 09:44:29 +01:00
Andrew Kingston d6688d1914 Use view name when generating bindings 2023-08-25 09:35:30 +01:00
Andrew Kingston 118bf9e9c3 Add ID and rev as filterable fields for views 2023-08-25 09:31:03 +01:00
Andrew Kingston 1dcc0b3d38 Updated leftover broken reference to function 2023-08-25 09:24:16 +01:00
Peter Clement 5226f7389b fix bug with app not being shown to per app builder 2023-08-24 16:41:52 +01:00
Andrew Kingston 8269ecf237 Update automatic dataprovider hot reloading to support views 2023-08-24 16:20:32 +01:00
Andrew Kingston d109411ed8 Update fetch row action to support views 2023-08-24 16:16:28 +01:00
Andrew Kingston 5763a9843c Update duplicate rows action to support views V2 2023-08-24 16:14:37 +01:00
Andrew Kingston fd71ad57da Add better support for generic DS+ into databindings and update save row to work with view V2s 2023-08-24 16:12:12 +01:00
Andrew Kingston c78fcb2ba6 Ensure 'table' type settings are migrated and handled properly. Allow deleting rows from views 2023-08-24 15:50:57 +01:00
Peter Clement d5aa975593 add per app builder support when adding groups 2023-08-24 15:42:32 +01:00
Dean 32f8638ffd Removed comment 2023-08-24 15:40:03 +01:00
Dean 38e46dfa15 Added fix for ComponentSettingSection component location 2023-08-24 15:26:00 +01:00
Andrew Kingston b6e675e3ff Migrate DS+ settings without keys 2023-08-24 15:15:15 +01:00
Dean dc500ba290 Merge remote-tracking branch 'origin/develop' into feature/form-block-ux-updates 2023-08-24 14:43:50 +01:00
Dean 1ec2faf74d List refinement, Form Block UX updates for action type. Bug fixes for FormBlock bindings. TableBlock UX updates and Component Setting updates 2023-08-24 14:39:53 +01:00
Andrew Kingston 409df71c12 Add hover color to divider in screen list 2023-08-24 12:11:22 +01:00
Andrew Kingston a22fc8d208 Merge branch 'develop' of github.com:Budibase/budibase into views-v2-frontend 2023-08-24 12:07:23 +01:00
Peter Clement 6b14353dcb update side panel to enable selecting of creator role 2023-08-24 11:40:00 +01:00
Andrew Kingston 07e49f4436 Standardise info boxes between theme and navigation 2023-08-23 16:46:32 +01:00
Andrew Kingston 07e5f04b6a Merge 2023-08-23 16:36:12 +01:00
Andrew Kingston 447523a4b8 Merge 2023-08-23 16:24:42 +01:00
Andrew Kingston f0e7f481de Merge branch 'design-section-feature-branch' of github.com:Budibase/budibase into screen-theme-rightpanel 2023-08-23 16:20:55 +01:00
Andrew Kingston e1ffd6107c Don't select screens as resources as they have no dedicated route 2023-08-23 15:53:15 +01:00
Andrew Kingston 9869b0cbc8 Lint 2023-08-23 15:50:00 +01:00
Andrew Kingston 94d9769310 Fix command palette navigating to screens 2023-08-23 15:46:41 +01:00
Andrew Kingston 277aa30b07 Fix keyboard actions for screen and nav 2023-08-23 15:41:45 +01:00
Andrew Kingston 0ef0e58e5e Fix click on navigation not selecting it 2023-08-23 15:37:13 +01:00
Andrew Kingston 80e622d2e0 Simply navigation URLs 2023-08-23 15:28:23 +01:00
Andrew Kingston 38044cdaea Fix escape keybind 2023-08-23 15:22:56 +01:00
Andrew Kingston 4759cdffe7 Fix add component keyboard shortcut 2023-08-23 15:21:18 +01:00
Andrew Kingston 9883157f30 Fix not being able to add components when either the screen or layout are selected 2023-08-23 15:19:53 +01:00
Andrew Kingston 4847cafd81 Fix navigating while moving between screens 2023-08-23 15:14:22 +01:00
Andrew Kingston 08d2074515 Fix add component FAB not working when screen or navigation are selected 2023-08-23 15:04:18 +01:00
Andrew Kingston a352f8ee0a Merge branch 'design-section-feature-branch' of github.com:Budibase/budibase into new-left-panel 2023-08-23 14:46:30 +01:00
Andrew Kingston 5d4124be4a Merge branch 'develop' of github.com:Budibase/budibase into design-section-feature-branch 2023-08-23 14:46:08 +01:00
Andrew Kingston 087812011f WIP for fixing collaboration in new left panel 2023-08-23 14:45:23 +01:00
Andrew Kingston a7de2d8aca Always create nav link for new screens 2023-08-23 11:21:53 +01:00
Andrew Kingston f1121a11a3 Improve route safety 2023-08-23 11:18:14 +01:00
Andrew Kingston 38e8ff879a Make new screen a dedicated route and remove duplication. Fix some issues when deleting selected screens 2023-08-23 11:14:04 +01:00
Andrew Kingston 607a36e2e4 Improve route handling when creating new components and screens 2023-08-23 11:03:00 +01:00
Andrew Kingston f72f3f88f7 Improve UX when resizing screen/component lists 2023-08-23 10:49:48 +01:00
Andrew Kingston d486a89ee7 Clean all URLs by default in URL state sync 2023-08-23 10:32:24 +01:00
Andrew Kingston a54c5b7222 Add resizable screen/component sections and remove redundant /components route 2023-08-23 10:27:56 +01:00
Andrew Kingston d0414812cf Adjust design section page layouts to stop remounting left nav on screen change 2023-08-22 17:51:47 +01:00
Andrew Kingston a4a639c2ba Update screen list size slightly 2023-08-22 16:49:04 +01:00
Andrew Kingston a07f343f83 Fix component scroll offsets not working 2023-08-22 16:45:37 +01:00
Andrew Kingston eba2fb0f13 Update component list header to be consistent 2023-08-22 16:41:15 +01:00
Andrew Kingston a6a6eb0ffe Update screen panel heading to match designs 2023-08-22 16:37:03 +01:00
Andrew Kingston 0ea81f98d6 Update panel headings to match new designs 2023-08-22 16:29:40 +01:00
Andrew Kingston 96e67c680b Fix navigation links drawer width 2023-08-22 16:24:00 +01:00
Andrew Kingston 0c57699d99 Remove deprecated settings from screen settings 2023-08-22 16:23:11 +01:00
Andrew Kingston 7e706c403a Adjust no results text when searching for screens 2023-08-22 16:21:48 +01:00
Andrew Kingston 909941aa6e Use normal spectrum color for screen search placeholder 2023-08-22 16:17:05 +01:00
Andrew Kingston 919158cf78 Use normal scrollbar for screen list 2023-08-22 16:16:35 +01:00
Andrew Kingston ec9f0a25ec Add background color to left panel 2023-08-22 16:16:22 +01:00
Andrew Kingston e77644ce11 Lint 2023-08-22 11:48:06 +01:00
Andrew Kingston c936304410 Fix grid config store so that schema overrides work 2023-08-22 11:31:25 +01:00
Dean 046ef853e3 Merge remote-tracking branch 'origin/develop' into feature/form-block-ux-updates 2023-08-22 09:06:46 +01:00
Andrew Kingston 59559ee93c Remove log and account for onEmptyFilter in grid button 2023-08-21 16:53:09 +01:00
Andrew Kingston 77f6a6d6c1 Merge branch 'develop' of github.com:Budibase/budibase into views-v2-frontend 2023-08-21 16:38:00 +01:00
Martin McKeaveney 8b01531420 Merge branch 'develop' into fix/new-column-popover-fixes 2023-08-21 14:11:48 +01:00
Dean 4c822663e8 Merge remote-tracking branch 'origin/develop' into feature/form-block-ux-updates 2023-08-21 12:50:26 +01:00
Andrew Kingston 6d46fb2963 Merge branch 'develop' of github.com:Budibase/budibase into views-v2-frontend 2023-08-21 11:57:28 +01:00
Gerard Burns d0f9694d24 linting 2023-08-21 08:33:53 +01:00
Gerard Burns 67d5eef293 screen search text 2023-08-21 08:16:42 +01:00
Gerard Burns c11cd9c3e2 remove new screen animation 2023-08-21 08:12:49 +01:00
Gerard Burns a5044ea85a conditional nav panel customize 2023-08-21 08:08:53 +01:00
Gerard Burns 0582c74ba0 links editor 2023-08-21 08:06:49 +01:00
Gerard Burns 4a60cb1d8e font family for input 2023-08-21 07:58:18 +01:00
Gerard Burns a577b706d1 change navitem chevron to be smaller for compact 2023-08-21 07:57:06 +01:00
Gerard Burns e267e71b68 icon hover states 2023-08-21 07:54:36 +01:00
Gerard Burns 4ddf797425 left panel icon color 2023-08-21 07:49:32 +01:00
Gerard Burns cc5a1be2a8 screen list alignment 2023-08-21 07:40:45 +01:00
Gerard Burns e6a712f880 component ndentation 2023-08-21 07:37:16 +01:00
Gerard Burns a34390c986 Stop preview remounting 2023-08-20 23:33:09 +01:00
Gerard Burns d4f6359820 screen scrollbar and screen panel height 2023-08-20 15:13:27 +01:00
Gerard Burns 6f4d92c3af border changes 2023-08-20 15:04:18 +01:00
Gerard Burns 5aea392616 hotkeys 2023-08-20 14:59:38 +01:00
Gerard Burns e5f818a0ce Reuse Component Panel 2023-08-20 14:59:22 +01:00
mike12345567 7110351bdc Revert "revert develop into master"
This reverts commit fd099658a0.
2023-08-18 14:33:21 +01:00
Gerard Burns 6886a312c5 New Left Panel for Design 2023-08-18 12:46:41 +01:00
Gerard Burns e3cfdd537a New Nav component (#11266) 2023-08-18 12:46:06 +01:00
Peter Clement 11069bacfb Merge remote-tracking branch 'origin/develop' into fix/new-column-popover-fixes 2023-08-18 09:34:27 +01:00
Michael Drury df31fb1b8d Merge branch 'develop' into fix/automation-improvements 2023-08-17 17:35:02 +01:00
mike12345567 e174211440 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-08-17 17:34:44 +01:00
melohagan b57a8c1130 Move when filter empty option into filter drawer (#11262)
* Add when filter empty dropdown

* Add unit tests

* "fix" typescript issue

* Add empty filter check for external

* Add unit test

* Hide empty filter option for custom query

* Make onEmptyFilter optional

* Fix unit tests

* Remove onEmptyFilter automation input

* Remove unused var

* Refactor

* Fix path

* Fix type issue

* Fix types
2023-08-17 13:31:52 +01:00
Martin McKeaveney fd099658a0 revert develop into master 2023-08-17 10:28:15 +01:00
Peter Clement a48a22f1b8 fix tooltips 2023-08-17 10:06:49 +01:00
mike12345567 e068e301ff Updating automation history tab to handle the stopped error status which can occur for CRONs. 2023-08-16 18:21:53 +01:00
Andrew Kingston 1ddd0bca21 Allow configuring access for views 2023-08-15 16:32:36 +01:00
mike12345567 822a086666 Refactoring to make it so that visible: false columns are removed from views, and when returning view schema, all columns are enriched. 2023-08-11 14:57:53 +01:00
Dean 29c8dbd94a Merge remote-tracking branch 'origin/develop' into feature/form-block-ux-updates 2023-08-11 14:20:25 +01:00
Andrew Kingston a671a85c46 Add WIP updates for view endpoint updates 2023-08-11 13:17:10 +01:00
Andrew Kingston dcb238251e Merge branch 'develop' of github.com:Budibase/budibase into views-v2-frontend 2023-08-11 12:12:56 +01:00
Peter Clement 6b75a653f8 focus input when popover opens 2023-08-11 12:00:33 +01:00
Peter Clement f7c1db5926 focus input when popover opens 2023-08-11 11:59:40 +01:00
Mel O'Hagan 1730b26489 Merge branch 'develop' into budi-6298-change-form-step-should-support-bindings 2023-08-11 07:43:40 +01:00
Michael Drury 08e663a8d3 Merge branch 'master' into budi-7350-filter-equal-for-numbers-not-working-in-data-providers 2023-08-10 16:28:59 +01:00
Dean 8d86e2e5dd Merge remote-tracking branch 'origin/develop' into feature/form-block-ux-updates 2023-08-10 14:50:46 +01:00
Andrew Kingston 5188abe4e5 Strip hidden fields from viewsV2 in design section 2023-08-09 16:39:23 +01:00
Andrew Kingston 08b348c1d4 Allow selecting viewV2s for grid blocks and form blocks 2023-08-09 16:22:12 +01:00
Andrew Kingston 06810d43d9 Add support for viewV2 datasources in client library 2023-08-09 15:09:53 +01:00
Adria Navarro c21da4fbd3 Consume packages from builder 2023-08-09 11:40:54 +03:00