Commit Graph

2300 Commits

Author SHA1 Message Date
Andrew Kingston 977445dae8 Only highlight style changes for the currently selected state (normal / hover) 2021-01-06 11:57:34 +00:00
Andrew Kingston a3a580d208 Standardise design panel setting placeholders 2021-01-06 11:52:02 +00:00
mike12345567 cb85ed1916 Merge branch 'master' of github.com:Budibase/budibase into feature/self-hosting 2021-01-06 11:00:02 +00:00
mike12345567 e25f64da71 Fixing up settings to only take the one URL now, the main hosting URL. 2021-01-06 10:59:10 +00:00
Andrew Kingston e3169be665 Remove deprecated prop 2021-01-06 10:23:42 +00:00
Andrew Kingston 9116658288 Update colorpicker to work with nullish values by always providing a fallback default value 2021-01-06 10:17:51 +00:00
Andrew Kingston 13134a8fea Use initialValue rather than defaultValue for style definitions 2021-01-06 10:15:22 +00:00
Andrew Kingston d25fd8b625 Pass preview type to client app so it can decide whether components are selectable 2021-01-06 10:11:56 +00:00
Andrew Kingston 0c89db4940 Merge branch 'master' of github.com:Budibase/budibase into custom-css 2021-01-05 12:02:08 +00:00
Andrew Kingston d7ef3d883f
Merge pull request #943 from Budibase/cheeks-bugfixes
Cheeks Bugfixes
2021-01-05 12:00:18 +00:00
Andrew Kingston 8a3561957b Mark individual styles as changed if they have been changed 2021-01-05 11:59:19 +00:00
Andrew Kingston ac7e99afc3 Add button to reset styles 2021-01-05 11:48:14 +00:00
Andrew Kingston 71a9e228d0 Mark style categories as changed whenever any of their properties have changed 2021-01-05 11:47:56 +00:00
Andrew Kingston 82baab3d9d Make option select component select placeholder option whenever the value is nullish 2021-01-05 11:47:09 +00:00
Andrew Kingston 3778589d0f Ensure new components are created with any default styles already applied 2021-01-05 11:46:31 +00:00
Andrew Kingston 8a5b7ca287 Add placeholders for all style options, add pretty labels for all style options 2021-01-05 11:45:50 +00:00
Andrew Kingston 1776c3101a Add fontend store method to reset styles and delete unset styles when updating styles 2021-01-05 11:44:58 +00:00
Joe d420f4231a Fix for: Small Typo in Data Binding textbox #962 2021-01-05 11:24:28 +00:00
Martin McKeaveney 0be3c722b8 allow execution of external connector queries from button clicks 2021-01-04 18:57:16 +00:00
Andrew Kingston 36ef89827a Add ability to enter custom component CSS 2021-01-04 18:39:17 +00:00
mike12345567 6baf4c3e39 Adding theme settings to main builder settings, this felt like a natural place to find it rather than needing to create an app. 2021-01-04 16:13:18 +00:00
Martin McKeaveney 4e41878618 better UI feedback 2021-01-04 10:39:17 +00:00
Martin McKeaveney 7adba016f4 use queries in front end 2020-12-30 12:58:39 +00:00
Martin McKeaveney 5b8e34f4d6 codemirror 2020-12-30 11:46:37 +00:00
Martin McKeaveney e92dedb795 v0.4.3 2020-12-23 22:39:10 +00:00
Andrew Kingston d7acc57ece Fix lag when swapping between settings and design options 2020-12-23 09:56:18 +00:00
Andrew Kingston d730967945 Fix new layouts having bad styling 2020-12-23 09:23:03 +00:00
Andrew Kingston b9453545d2 Fix empty screen list when navigating between roles 2020-12-23 08:54:09 +00:00
mike12345567 4c8ee99905 Merge branch 'master' of github.com:Budibase/budibase into feature/self-hosting 2020-12-22 16:24:34 +00:00
Martin McKeaveney 63ad74b660 separation of datasources and queries 2020-12-18 18:19:43 +00:00
mike12345567 8655d73248 Update after testing, it is now possible to make a deployment to a self hosted environment. Some work still required, better authentication around MINIO deployment, currently the bucket is set to public read and there is no signing/verification to the upload process, also right now four different URLs are needed for the builder to connect correctly, ideally this shouldn't be the case. 2020-12-18 12:54:20 +00:00
kevmodrome 851515896f
remove console logs 2020-12-18 11:12:00 +01:00
kevmodrome d62f0752da
fixes encoding issue of file to work with non-english chars 2020-12-18 11:10:36 +01:00
mike12345567 15f8328770 Adding a deployment service which takes over from the lambdas in local operation, this may become part of the hosting portal if we ever decide to opensource that part of it. 2020-12-16 19:50:02 +00:00
kevmodrome 2284ff812b
merge master 2020-12-16 15:33:37 +01:00
kevmodrome 52e826e4ec
add back accidently removed line of code 2020-12-16 15:31:20 +01:00
kevmodrome a9aa68c7bf
lint fix 2020-12-16 15:22:31 +01:00
kevmodrome b472ad0c63
fixes CreateEditRow not display multiselect correctly when long-form component was used 2020-12-16 13:00:07 +01:00
kevmodrome 94e56ee94d
adds try/catch to API key validation 2020-12-16 11:35:12 +01:00
mike12345567 eae0e678d0 Linting. 2020-12-16 09:43:08 +00:00
mike12345567 f63466f1d1 Updating deployment service, checking in builder the builder settings info stored in DB before deploying. 2020-12-15 17:27:45 +00:00
mike12345567 fd1d7e3aa1 Linting. 2020-12-15 16:42:40 +00:00
mike12345567 775f84b6dc Adding feature to allow configured the builder to point at a self hosted system instead of production (for deployment). 2020-12-15 16:41:55 +00:00
Martin McKeaveney 79c9df6ea2 v0.4.2 2020-12-15 15:23:45 +00:00
Martin McKeaveney a0e6ffd3e0 v0.4.1 2020-12-15 14:46:11 +00:00
Andrew Kingston c54ea7294b Fix bug with changing app name 2020-12-15 13:40:49 +00:00
Martin McKeaveney 0c93c17292 v0.4.0 2020-12-15 11:53:28 +00:00
Andrew Kingston 6f521c1644 Small JS syntax refactor 2020-12-14 13:36:09 +00:00
Andrew Kingston fb1ca5e7ef Fix cypress tests 2020-12-14 13:33:34 +00:00
Andrew Kingston 119107834f Rename create new row to create new user for users table 2020-12-14 13:24:09 +00:00
Andrew Kingston 449509a203 Fix URL update after creating a new layout 2020-12-14 11:14:36 +00:00
Andrew Kingston aa71e95597 Allow independent selection of screen IDs and layout IDs so that selections persist between toggling tabs. Update logic around role selection and screen filtering 2020-12-14 11:14:16 +00:00
Martin McKeaveney 89615e58a7 merge 2020-12-12 20:09:04 +00:00
Andrew Kingston 672fe3fcc9 Keep honouring selected screen access role after swapping to layout tab 2020-12-11 15:29:25 +00:00
Andrew Kingston ef9415ae3b Select new role when creating screen with a different role than the selected one 2020-12-09 19:04:46 +00:00
Andrew Kingston db40514eb1 Lint 2020-12-09 18:56:54 +00:00
Andrew Kingston c8d7ef40ca Reduce nav item selected state border radius slightly 2020-12-09 18:41:18 +00:00
Andrew Kingston 3abacb3b65 Allow multiple screens to have the same URL as long as role is different 2020-12-09 18:39:49 +00:00
Andrew Kingston bd488463cb Add role selection for viewing screens and smart handling of preview screen 2020-12-09 18:18:47 +00:00
mike12345567 8426998e77 Merge branch 'master' of github.com:Budibase/budibase into feature/self-hosting 2020-12-09 18:01:38 +00:00
Andrew Kingston ce917b5005 Fix empty screen list when deleting a table backing an autoscreen which is currently selected 2020-12-09 16:01:16 +00:00
Andrew Kingston 52dd9760c5 Fix merge bug 2020-12-09 15:58:34 +00:00
Andrew Kingston fdbb8ac61c Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-09 15:57:32 +00:00
Andrew Kingston 5f37cabd24 Force white background behind prevrew iframe regardless of theme to better reflect what the real app will look like 2020-12-09 15:43:06 +00:00
Andrew Kingston fdfe16a649 Fix z index in beta warning 2020-12-09 15:42:44 +00:00
Andrew Kingston 4dd0d5b016 Cache roles in store and add role selector for screens 2020-12-09 15:35:57 +00:00
Andrew Kingston 5882f76c9a Allow role selection when creating new screen 2020-12-09 14:53:17 +00:00
Andrew Kingston 112fce654c Navigate to new layout after creating it 2020-12-09 14:53:03 +00:00
Andrew Kingston 31f0b51039 Fix bugs around selecting screens and layouts when creating them 2020-12-09 14:51:42 +00:00
kevmodrome 71fa1e1700
colorpicker for links in card component now works correctly 2020-12-09 15:27:24 +01:00
Andrew Kingston a8a7a94eff Purge all references to _css prop or saving stylesheets 2020-12-09 12:22:30 +00:00
kevmodrome a91fc28eb9
changes settings prop of card link color 2020-12-09 13:21:04 +01:00
Andrew Kingston c65425d631 Fix routing setting and add initial role ID setting to screens for testing 2020-12-09 12:16:00 +00:00
Andrew Kingston 68ed9e9f32 Fix crash when having a screen selected that was deleted 2020-12-09 11:37:09 +00:00
Andrew Kingston 2e68f51b8f Fix selected row state not resetting properly 2020-12-09 11:31:50 +00:00
kevmodrome a300120b96
adds colorpicker to card componeent 2020-12-09 12:00:17 +01:00
Martin McKeaveney e48be7a109 further tidy up 2020-12-08 18:57:19 +00:00
mike12345567 2928a379b0 Updating builder/server in a few ways, to allow creating users with extra columns attached, allowing password to be updated in the builder and making sure that all row endpoints correctly pass through the user controller so that we can still have customised functionality for users (such as making sure password is never returned). 2020-12-08 17:33:08 +00:00
Martin McKeaveney f355a16ca4 fixing bugs found during testing 2020-12-08 16:55:43 +00:00
Andrew Kingston e472150f30 Sort path groupings 2020-12-08 15:34:15 +00:00
Andrew Kingston 36ca1143e1 Fix bug which caused autolinks to not be generated 2020-12-08 15:21:01 +00:00
Andrew Kingston 0f1ae6a28a Fix indentation level in screen and layout trees 2020-12-08 15:11:26 +00:00
Andrew Kingston 882092784a Add custom renderer for user roles to show pretty names 2020-12-08 14:03:47 +00:00
Andrew Kingston 9054a8014a Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 13:16:53 +00:00
Andrew Kingston d0f2d4c2cd Update user editing to support new email field 2020-12-08 11:43:37 +00:00
Martin McKeaveney cbfe0f8409 lint 2020-12-08 11:07:16 +00:00
Martin McKeaveney 5f7ed62a77 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-08 10:32:52 +00:00
Martin McKeaveney ae00e54d91 Different names for home and login screen 2020-12-08 10:32:45 +00:00
Andrew Kingston df37177239 Tidy up builder preview iframe 2020-12-08 10:16:01 +00:00
Andrew Kingston 0a9f6c3d33 Remove client bundle from being packaged with the builder 2020-12-08 10:14:02 +00:00
Martin McKeaveney d8aa699bfa merge 2020-12-07 21:20:35 +00:00
Martin McKeaveney 6e664b3795 fix layout bugs, some tidy up 2020-12-07 20:29:41 +00:00
Andrew Kingston e7c929ed84 Add custom modal for creating and editing users 2020-12-07 19:05:39 +00:00
mike12345567 e4ef92555c Merge branch 'username-email' of github.com:Budibase/budibase into feature/security-update 2020-12-07 18:08:20 +00:00
Martin McKeaveney 32d5a83b09 remove dupe import 2020-12-07 16:06:50 +00:00
Martin McKeaveney a014db4185 fix layout selection issues 2020-12-07 16:06:20 +00:00
Andrew Kingston a3dd9f1978 Remove log statement 2020-12-07 15:59:37 +00:00
Andrew Kingston 743dc950cd Fix crash when changing screen layout 2020-12-07 15:59:19 +00:00
Martin McKeaveney 7fa252ec07 merge 2020-12-07 15:53:51 +00:00
Martin McKeaveney b4fad77aae lint 2020-12-07 15:49:19 +00:00
Martin McKeaveney 81fe27f8f3 component store refactor - remove concept of currentPreviewItem and currentComponentInfo 2020-12-07 15:27:46 +00:00
Andrew Kingston a8c715efa5 Fix URLs when clicking on screens 2020-12-07 10:32:58 +00:00
Martin McKeaveney 274708b4e0 consolidate routing and component selection 2020-12-05 12:09:58 +00:00
Martin McKeaveney de5e7d38ba allow renaming of layouts 2020-12-05 09:43:00 +00:00
Martin McKeaveney 8775c594a1 deletion and error handling of layouts 2020-12-04 23:42:22 +00:00
Martin McKeaveney 84434741d1 allow creation of custom layouts, moving layoutId prop to top level of screen 2020-12-04 23:16:07 +00:00
Andrew Kingston 8e2f5b379c Fix new screen button placement 2020-12-04 14:52:40 +00:00
Martin McKeaveney 8980895dac lint 2020-12-04 14:46:21 +00:00
Andrew Kingston d1940bafc9 Fix screen list UI width and tidy up unused imports 2020-12-04 14:07:56 +00:00
Andrew Kingston a5f78c3f8e Remove log statement 2020-12-04 14:07:23 +00:00
Andrew Kingston 69b2261768 Add basic role by default to new screens 2020-12-04 14:06:55 +00:00
Martin McKeaveney d6b00d5ebe email as default user identifier 2020-12-04 12:22:45 +00:00
Andrew Kingston 3b57ef3b0f Update stat card to use new component SDK 2020-12-04 09:13:38 +00:00
Andrew Kingston 2cb4f1228a Merge branch 'master' of github.com:Budibase/budibase into stat-card 2020-12-04 09:00:43 +00:00
Andrew Kingston d9df2a60eb Update errors box to work better in dark theme 2020-12-04 08:27:59 +00:00
Andrew Kingston c346630dfe Add modal for editing user roles 2020-12-04 08:27:42 +00:00
Martin McKeaveney af24967c88 accommodate login layout 2020-12-03 17:31:38 +00:00
Martin McKeaveney 8ec836970c allow selection of layout 2020-12-03 15:25:17 +00:00
Martin McKeaveney 7254f23227 tidy up 2020-12-03 15:19:19 +00:00
Martin McKeaveney a0b4062a1f more intelligent routing for screens and pages 2020-12-03 15:15:14 +00:00
kevmodrome 6e7bd09588
now uses RichText component in create/edit row modal on the backend 2020-12-03 15:37:04 +01:00
kevmodrome 0725b3bd6d
adds rollup-json to standard-components and adds RichText to Form component 2020-12-03 15:03:17 +01:00
kevmodrome 619011d7e8
adds new richtext version and adds it to the Form component 2020-12-03 13:19:14 +01:00
mike12345567 b65a554ede Linting and update to try and fix issues when screens are created, screen saving now generates CSS. 2020-12-03 12:08:33 +00:00
Andrew Kingston 3ab5c834f7 Update client app to work with layouts when running inside builder preview 2020-12-02 18:10:46 +00:00
Martin McKeaveney f386d0c72b tidy up 2020-12-02 17:07:30 +00:00
Martin McKeaveney 4466923c84 allow editing of screen layout from modal 2020-12-02 16:15:14 +00:00
Martin McKeaveney 504565c3fc component tree layout/screen agnostic 2020-12-02 15:19:38 +00:00
Martin McKeaveney 8cae8e1705 E2E working 2020-12-02 14:49:43 +00:00
mike12345567 fa8d8fcfea Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-02 14:18:49 +00:00
Martin McKeaveney f70db5df36 merge 2020-12-02 14:15:07 +00:00
Andrew Kingston 859ae5f8a4 Move selection highlighting in builder preview in to client library and replace handlebars with mustache again 2020-12-02 13:49:24 +00:00
Martin McKeaveney 48318030a2 merge 2020-12-02 13:44:44 +00:00
Martin McKeaveney 4a51618c11 fix preview save 2020-12-02 13:41:00 +00:00
mike12345567 c7ba0a9cce Linting. 2020-12-02 13:27:20 +00:00
mike12345567 c832ed36d4 Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/page-refactor 2020-12-02 13:26:57 +00:00
mike12345567 abe3bdabad Linting. 2020-12-02 13:21:13 +00:00
mike12345567 05d5feb9fd Changing the naming of access levels to be roles. 2020-12-02 13:20:56 +00:00
Martin McKeaveney 5674bfc8fa merge 2020-12-01 16:31:40 +00:00
Martin McKeaveney 01343e1474 layouts and screens switcher, merge with component sdk 2020-12-01 16:22:06 +00:00
Andrew Kingston a7fef455ed Fix cypress tests (sort of) 2020-12-01 14:35:47 +00:00
Andrew Kingston fd65e5e8a0 Fix unit tests 2020-11-30 16:14:45 +00:00
Andrew Kingston ce18e253ba Remove deprecated props, fix warnings, remove old code 2020-11-30 15:05:36 +00:00
Andrew Kingston 3ee9fee10c Optimise builder preview speed and performance and fix components not updating when changing props 2020-11-30 12:11:50 +00:00
mike12345567 9b5734b1de Merge branch 'master' of github.com:Budibase/budibase into feature/page-refactor 2020-11-30 11:47:08 +00:00
Joe 3231be4b8c Formatting and linting 2020-11-28 16:44:07 +00:00
Joe 5cfc6a6eda Stat card
During lab day, I created a stat card. This card allows the user to display a single value, with an optional title and label. This is a popular component that will save our users time - expecially when creating dashboards.
2020-11-28 16:35:42 +00:00
mike12345567 d7f2060954 Some further work after testing, really need to get the backlink of screens to layouts functional. 2020-11-27 16:36:31 +00:00
Andrew Kingston cb626d685b Merge branch 'master' of github.com:Budibase/budibase into component-sdk 2020-11-27 15:59:32 +00:00
Martin McKeaveney e14d2517f4 allow password creation 2020-11-27 15:33:32 +00:00
Martin McKeaveney b4440abdd6 allow creation of username 2020-11-27 15:24:43 +00:00
mike12345567 8519ea1a97 Merge branch 'component-sdk' of github.com:Budibase/budibase into feature/page-refactor 2020-11-27 15:11:56 +00:00
Martin McKeaveney 88a61b3b72 prevent username changing 2020-11-27 14:59:27 +00:00
Martin McKeaveney f38e701d38 fix tests 2020-11-27 14:36:36 +00:00
Martin McKeaveney 1014437d42 fix user test 2020-11-27 13:17:31 +00:00
Martin McKeaveney 6518976825 browse contents of s3 buckets from within budibase 2020-11-26 21:23:20 +00:00
Martin McKeaveney c12b59e304 CouchDB integration E2E 2020-11-26 17:34:15 +00:00
Martin McKeaveney 1f891cc8ae mongoDB end to end 2020-11-26 16:46:36 +00:00
Martin McKeaveney 113c68e4c9 budibase postgres E2E working 2020-11-26 14:43:56 +00:00
Andrew Kingston b000174fce Merge branch 'master' of github.com:Budibase/budibase into component-sdk 2020-11-25 18:38:58 +00:00
Andrew Kingston 9c4b9a2a25 Add fade screen transition and fix navigation component casing 2020-11-25 18:30:09 +00:00
mike12345567 d3759a4c10 Major re-work, client library stills needs some work but it appears layouts and screens are no longer inter-dependent. 2020-11-25 17:56:09 +00:00
Martin McKeaveney 792eac2ca5 fix filepath issue 2020-11-25 16:27:49 +00:00
Martin McKeaveney 61a9d954e5 fix users test, remove superfluous files 2020-11-25 15:30:10 +00:00
mike12345567 f2fc4f1a4c Merge branch 'component-sdk' of github.com:Budibase/budibase into feature/page-refactor 2020-11-25 15:04:23 +00:00
Andrew Kingston 907c0fcfda Add button actions, simplify contexts and tidy up 2020-11-25 09:50:51 +00:00
mike12345567 8b4657b196 Starting work on builder, very broken. 2020-11-24 18:11:34 +00:00
Martin McKeaveney 9f2832af94 tidy up 2020-11-24 17:02:58 +00:00
Martin McKeaveney f1fe5de294 users as table working end to end 2020-11-24 17:00:15 +00:00
Martin McKeaveney 327f77dbb3 user table and relationships complete 2020-11-24 14:04:14 +00:00
Martin McKeaveney 27813f5fbb fix windows url issue 2020-11-24 10:23:29 +00:00
Andrew Kingston 74fdd36bce Add actual component for screenslot placeholder 2020-11-23 14:27:45 +00:00
Martin McKeaveney 831d19e11c fix fast view switching bug 2020-11-23 12:12:03 +00:00
mike12345567 b63ca545bf Merge branch 'component-sdk' of github.com:Budibase/budibase into feature/page-refactor 2020-11-23 11:30:15 +00:00
Andrew Kingston 192959c865 Fix builder preview 2020-11-23 11:29:24 +00:00
mike12345567 6aa2e53a40 Merge branch 'component-sdk' of github.com:Budibase/budibase into feature/page-refactor 2020-11-23 11:00:19 +00:00
Martin McKeaveney 42d8a94f9a fix e2e 2020-11-20 11:41:17 +00:00
Andrew Kingston 911fa31fe3 Tidy up data binding 2020-11-20 10:49:39 +00:00
Martin McKeaveney 2bba574ab1 fix for delete screens 2020-11-19 21:07:25 +00:00
Martin McKeaveney 1f1dfbe296 folders for routes, show home instead of slash 2020-11-19 20:50:17 +00:00
Martin McKeaveney a4e0ba8e4b Merge branch 'feature/backend-routing' of github.com:Budibase/budibase into routing-ui 2020-11-19 20:48:23 +00:00
Michael Drury 7f3f11c68b Fixing issues thrown up by PR. 2020-11-19 20:31:11 +00:00
Andrew Kingston 2cb4cb2ce9 Add header to flag whether a request originates from the client 2020-11-19 20:04:30 +00:00
Andrew Kingston 71b59d7cca Merge branch 'feature/backend-routing' of github.com:Budibase/budibase into component-sdk 2020-11-19 17:55:40 +00:00
Martin McKeaveney 169cbe4a42 Merge branch 'feature/backend-routing' of github.com:Budibase/budibase into routing-ui 2020-11-19 17:08:10 +00:00
mike12345567 c541cd078b Removing unused statement. 2020-11-19 17:07:39 +00:00
mike12345567 f5191862d5 Removing unused line. 2020-11-19 17:05:25 +00:00
Martin McKeaveney 7b2a9ec807 merge 2020-11-19 17:02:27 +00:00
mike12345567 c240274889 Merge branch 'master' of github.com:Budibase/budibase into feature/backend-routing 2020-11-19 16:58:54 +00:00
mike12345567 a9d5c3a5cb linting. 2020-11-19 16:56:23 +00:00
mike12345567 87528c8d55 Fixing issues with the application API, it utilised /api/:appId heavily which is a route that matches nearly everything. 2020-11-19 16:55:59 +00:00
Martin McKeaveney 270dbe933f tidy up 2020-11-19 16:41:29 +00:00
Martin McKeaveney 83924f0efa remove old files 2020-11-19 16:12:55 +00:00
Andrew Kingston 70a88589e9 Merge branch 'feature/backend-routing' of github.com:Budibase/budibase into component-sdk 2020-11-19 13:56:51 +00:00
Andrew Kingston c1c7c8ede4 Fix fetching of relationship data in lists 2020-11-19 13:50:20 +00:00
Martin McKeaveney d473786d7e further store tidy up, derive selected page 2020-11-19 11:15:29 +00:00
Martin McKeaveney a5827a9c53 nested routing UI up and running, refactor drag and drop functionality by decoupling store from components 2020-11-18 22:04:18 +00:00
Andrew Kingston 1bd2fac9b2 Update all components to be renderable and styleable 2020-11-18 21:06:12 +00:00
Andrew Kingston a18a861177 Refactor entire SDK into client lib and enable svelte context sharing between client and components 2020-11-18 19:18:18 +00:00
mike12345567 634eacd5b9 Changing back to builder getting the normal routing structure for builder. 2020-11-18 15:13:25 +00:00