CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-03 21:40:55 +12:00
Code Issues Projects Releases Wiki Activity
9891 commits 78 branches 2875 tags 836 MiB
Commit graph

487 commits

Author SHA1 Message Date
mike12345567 166bf153de WIP - starting to work on deployment and hosting so that they don't use static URLs anymore to reach assets, instead using environment variables to determine what to use. 2020-12-14 18:31:48 +00:00
mike12345567 186fe1e8f1 Adding the ability to change default logo URL for new apps in self hosting. 2020-12-14 15:56:33 +00:00
mike12345567 1904ec8bb4 Updating API key controller in self-host mode to return self host API key. 2020-12-09 17:10:53 +00:00
mike12345567 bc5f520a03 Adding in self hosted API key. 2020-12-09 17:04:05 +00:00
mike12345567 c3abc9fed4 Removing the static CSS bundling from the server as it is no longer required. 2020-12-09 12:30:21 +00:00
mike12345567 40d855df10 Updating row controller to make sure that all user requests (bar deletion) are passed through correctly to the user controller so that any logic such as removing user password can be correctly held in the user controller logic. 2020-12-09 10:54:30 +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
mike12345567 57029e737b Fixing an issue with power user not being usable. 2020-12-08 12:20:37 +00:00
Andrew Kingston 883b3761d5 Fix bug with checking user access 2020-12-04 14:01:10 +00:00
mike12345567 f0d447abcd Fixing a caching bug found by cheeks. 2020-12-04 14:01:02 +00:00
mike12345567 65302e1dd9 Changing the role system to have permissions integrated rather than the permissions being per user. 2020-12-02 17:08:25 +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 05d5feb9fd Changing the naming of access levels to be roles. 2020-12-02 13:20:56 +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
mike12345567 5eec4d7a47 Creating CSS generation capabilities in the server. 2020-11-24 18:11:18 +00:00
mike12345567 b1bb7abdef Changing up how the static assets are compiled, making a 'css' directory in which individual assets CSS is written and then bundled together meaning that not all assets need to be sent up at once for css bundle to be built. 2020-11-23 16:56:35 +00:00
mike12345567 8ff9635cd1 Removing all reference to 'pages' in server source code, now to look at builder. 2020-11-23 15:46:26 +00:00
mike12345567 90a8435641 Storing some work in commit, currently broken, further work needed - application needs cleaned up. 2020-11-23 14:07:18 +00:00
Michael Drury c03923360b Minor update to make use of new client header to state the request is from the client, not the builder. 2020-11-19 20:18:28 +00:00
Michael Drury 624078636b Minor update to make use of new client header to state the request is from the client, not the builder. 2020-11-19 20:16:37 +00:00
mike12345567 48f0608c74 Fixing some bugs with previous commit and updating to add the functionality of the api/routing/client. 2020-11-18 15:12:42 +00:00
mike12345567 d63054a426 Updates for screen refactor - finishing off getting everything over to the class based system. 2020-11-17 13:25:57 +00:00
mike12345567 acdc1e9a56 Updating to have proper access control via an accessController and nearly ready to spit out the routing structure. 2020-11-16 18:04:44 +00:00
Michael Drury 63b08e42aa Large update, tests passing, have simplifed access level API, access levels and permissions are now totally separate. 2020-11-13 15:35:20 +00:00
mike12345567 2472168477 Tests failing but starting to progress. 2020-11-12 17:06:55 +00:00
mike12345567 c8a3b18513 Merge branch 'feature/backend-routing' of github.com:Budibase/budibase into feature/backend-routing 2020-11-12 15:10:07 +00:00
Martin McKeaveney ff66ed35c6 tidy up 2020-11-12 10:41:49 +00:00
Martin McKeaveney cd5dd2d21d JSDoc for static asset compilation 2020-11-12 10:36:15 +00:00
Martin McKeaveney c2aa9eebfc remove squirrelly, compile a single bundle.css for each page, svelte and hbs server rendering 2020-11-12 10:25:25 +00:00
Michael Drury 4852ecf96a WIP - this is working towards the permissions system but stopping here for the night, this is currently not functional. 2020-11-11 17:34:15 +00:00
mike12345567 3d6f50ee5d Improving consistency of how appId is retrieved and making sure it is valid when being used. 2020-11-09 14:38:29 +00:00
Martin McKeaveney 596940371e remove superfluous files 2020-11-06 13:46:19 +00:00
mike12345567 667052e0b4 Updating templates to be able to run locally with an environment variable LOCAL_TEMPLATES and making them work using the DB. Users are also no longer included in the db dump. 2020-11-06 12:30:30 +00:00
mike12345567 a9ac8d0632 Fixing some bugs that have been found. 2020-11-05 14:38:44 +00:00
Martin McKeaveney 3847c058dc rename buildPage 2020-11-05 13:41:16 +00:00
mike12345567 76cc7d897c More cleanup, removing template app pages that were unused and fixing a bug with auth not being configured correctly when app created. 2020-11-05 12:43:03 +00:00
Martin McKeaveney 291e472765 cut over to new frontend store 2020-11-04 17:09:45 +00:00
Martin McKeaveney 333844a1f0 feature parity with current pages, screens and store setup. Starting main bb store refactor 2020-11-04 16:13:50 +00:00
Michael Drury 9e72e122b6 Merge branch 'master' of github.com:Budibase/budibase into tidy-up-store 2020-11-04 10:14:19 +00:00
Martin McKeaveney 3725a1782b screens in DB 2020-11-03 16:27:28 +00:00
Michael Drury 27871c1bc0 Removing appIds from tokens to reduce confusion. 2020-11-03 13:58:17 +00:00
Michael Drury a35b6a57f9 Further work towards the re-implementation of auth, changing how the appId is determined, now it mainly will use a header, and a cookie which will be written to store the current status of appId. 2020-11-03 13:45:49 +00:00
Michael Drury 215e1251bc Some further work, logout and preview appear to be working much better now. 2020-11-02 22:46:31 +00:00
mike12345567 0c81516662 Some more re-work, more testing needed to auth stuff. 2020-11-02 20:14:10 +00:00
Michael Drury 98157f076f Some updates, still WIP. 2020-11-02 15:46:08 +00:00
Martin McKeaveney 74890b13c9 pages being stored in couch on initialisation and page save 2020-11-02 14:56:48 +00:00
Martin McKeaveney f29d34ae0b Merge branch 'master' of github.com:Budibase/budibase into tidy-up-store 2020-10-30 16:25:00 +00:00
Martin McKeaveney 2f0a19a152 removing dead code 2020-10-29 11:46:26 +00:00
mike12345567 2180a1639d Fixing another linting issue. 2020-10-29 11:04:02 +00:00
mike12345567 8963520454 Merge branch 'master' of github.com:Budibase/budibase into feature/remove-multitenancy 2020-10-29 10:45:02 +00:00
mike12345567 d587bad363 Renaming instanceId -> appId to reduce confusion through the system, there only is one ID now. 2020-10-29 10:28:27 +00:00
Michael Drury c3a4111292 Some quick fixes. 2020-10-28 22:13:16 +00:00
Martin McKeaveney cc62b60edd adding cloud check to dev check 2020-10-28 21:27:37 +00:00
mike12345567 d79be3c854 Initial work into multi-tenancy removal, experiencing issues with test cases at this point. 2020-10-28 20:35:06 +00:00
mike12345567 12e4ec2e99 Merge branch 'bug/local-forbidden' of github.com:Budibase/budibase into feature/webhooks 2020-10-26 17:59:03 +00:00
mike12345567 27acbac235 Found an issue where environment variables would load before they had actually been updated from dotenv, made sure they are always loaded correctly. 2020-10-26 17:49:33 +00:00
mike12345567 a967645a21 Some initial work towards webhooks, that generates schema similar to integromat. 2020-10-22 17:48:32 +01:00
mike12345567 2550c45831 Merge branch 'master' of github.com:Budibase/budibase into version-complibrary 2020-10-21 15:33:23 +01:00
mike12345567 012b290895 Adding a version to the app and then including this in user authentication, this for now is just the version of the builder/server that it was built with. 2020-10-21 15:28:30 +01:00
Andrew Kingston 8428bebc13 Replace sharp with jimp for image processing 2020-10-21 13:00:23 +01:00
Andrew Kingston 37553ef80d Fix test 2020-10-20 12:52:55 +01:00
Andrew Kingston 05cb7e5374 Allow CSV upload in browser and add display column option 2020-10-19 19:24:05 +01:00
mike12345567 c319054c30 Fixing some issues seen with cloudfront and adding a bit more UI around the deployment history as pending can be happening for some time. 2020-10-19 15:33:26 +01:00
Andrew Kingston 2ce51346ca Fix default home page overriding detail pages 2020-10-16 15:32:50 +01:00
Andrew Kingston 454199b17d Set default link font weight to 500 2020-10-16 15:32:30 +01:00
Andrew Kingston 534f00515d Add XS shadow to top nav header to act as a slight border 2020-10-16 08:38:04 +01:00
mike12345567 bbe085f734 Some changes for authentication and getting rid of allScreens component of store as it was causing confusion and breakages. 2020-10-15 13:52:56 +01:00
Andrew Kingston 32df91895e Merge branch 'master' of github.com:Budibase/budibase into screen-updates 2020-10-14 17:09:50 +01:00
Andrew Kingston c108b718a9 Update default page templates 2020-10-14 17:06:58 +01:00
Andrew Kingston b2f4ba98f0 Add translucent background to slot component 2020-10-14 17:05:29 +01:00
Martin McKeaveney 78ae3f194c merge 2020-10-14 15:08:54 +01:00
Martin McKeaveney d2a7bf55a7 lint 2020-10-14 13:21:43 +01:00
Martin McKeaveney 2ba10662d3 fix csv import 2020-10-14 13:09:03 +01:00
mike12345567 bfaa9bc44b Merge branch 'master' of github.com:Budibase/budibase into chuckles-fixes 2020-10-14 12:16:16 +01:00
Martin McKeaveney e95af51cde simplify user authentication, remove anon user, fix login cookie issues 2020-10-13 21:33:56 +01:00
Andrew Kingston 650ace2f9e Add flex design property and fix existing default layout 2020-10-13 17:46:18 +01:00
mike12345567 3fd5e7e578 Removing deprecated function - exists. 2020-10-13 17:02:59 +01:00
mike12345567 a6264896fa Merge branch 'feat/linked-records-data-source' of github.com:Budibase/budibase into endpoint-renaming 2020-10-13 09:58:31 +01:00
mike12345567 1140f65282 Merge branch 'feat/linked-records-data-source' of github.com:Budibase/budibase into endpoint-renaming 2020-10-13 09:58:08 +01:00
Andrew Kingston fc870c0dc9 Add back in sharp reference which was commented out 2020-10-13 09:42:44 +01:00
Andrew Kingston d8e349ddaa Merge branch 'master' of github.com:Budibase/budibase into feat/linked-records-data-source 2020-10-13 09:24:13 +01:00
Martin McKeaveney bf9efc7102 remove screen1 from dummy data 2020-10-12 21:22:23 +01:00
Andrew Kingston 42019dd546 Merge branch 'master' of github.com:Budibase/budibase into feat/linked-records-data-source 2020-10-12 11:26:04 +01:00
mike12345567 3f0d205846 Merge branch 'master' of github.com:Budibase/budibase into endpoint-renaming 2020-10-12 09:41:42 +01:00
Martin McKeaveney 506779f8cd
Merge branch 'master' into deployment-api-usage 2020-10-09 21:43:28 +01:00
Martin McKeaveney 3f81757faa deployment API usage complete 2020-10-09 21:42:20 +01:00
mike12345567 73e0e37c66 Fixing some bugs with JWT creation not getting an API key. 2020-10-09 20:44:35 +01:00
mike12345567 d90c1e3dd3 Changing record -> row in this update, completing the update of renaming in the builder, this release needs further testing. 2020-10-09 19:10:28 +01:00
mike12345567 bb3370e742 Renaming Model -> Table across the entire system, this is an unstable update and has not been tested fully yet. 2020-10-09 18:49:23 +01:00
mike12345567 86102982a1 Making sure any errors that occur in usage quota are thrown up to stop endpoint from functioning. 2020-10-09 17:28:49 +01:00
Andrew Kingston 1091526e1f Merge branch 'master' of github.com:Budibase/budibase into feat/linked-records-data-source 2020-10-09 12:34:25 +01:00
Andrew Kingston d1f367ccff Add relationships as data source 2020-10-09 12:24:18 +01:00
mike12345567 4ba636897b Adding in default plan if the obj found does not have the required information. 2020-10-09 11:32:25 +01:00
mike12345567 844383631e Merge branch 'master' of github.com:Budibase/budibase into api-usage-tracking 2020-10-09 11:21:26 +01:00
mike12345567 ba758905cc Removing sanisation, instead just using it as a central path system. 2020-10-09 10:00:57 +01:00
mike12345567 334b4b1696 Update to IDs as has been discussed, to change them from colons (:) to underscores (_) as this is more URL, S3 and file system safe. Also shortening most prefixes down to two characters. 2020-10-09 09:47:37 +01:00
mike12345567 275bd64b1b Fixing linting issue. 2020-10-08 18:36:31 +01:00
mike12345567 b400a06027 Updates for API usage after testing against local Dynamo. 2020-10-08 17:34:41 +01:00
mike12345567 f2b7d85b6e Fixing up middleware to handle uploads, views, records, automation runs and users. 2020-10-07 17:56:47 +01:00
mike12345567 17a4b058b5 Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-10-07 14:48:20 +01:00
mike12345567 1f8f0a0444 Sanitising the paths to the couchDB data directories. 2020-10-07 11:42:28 +01:00
mike12345567 1d99cc654a Adding a regex to allow certain paths with : on windows. 2020-10-07 11:04:36 +01:00
Andrew Kingston fd02f361f1 Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-10-07 10:45:26 +01:00
mike12345567 691ea16998 Adding a basic sanitise path function and fixing up use cases of appId filesystem paths throughout the system. 2020-10-07 00:24:56 +01:00
Martin McKeaveney c9cfa2c5f9 cleaner parsing 2020-10-05 19:21:51 +01:00
Martin McKeaveney 6f28374785 merge 2020-10-05 15:08:53 +01:00
Martin McKeaveney e1eb4f04f3 tidy up 2020-10-05 14:43:34 +01:00
Martin McKeaveney f89aa4b403 adding nice loading states 2020-10-05 14:07:39 +01:00
Martin McKeaveney 13aca3cde0 unit tests for csv parser 2020-10-05 11:48:13 +01:00
mike12345567 e0dad53ad3 Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-10-05 10:52:35 +01:00
Martin McKeaveney a3c082347c account for omitted rows 2020-10-05 10:51:58 +01:00
Martin McKeaveney ecb4cff96f CSV Import end to end 2020-10-02 16:16:06 +01:00
Martin McKeaveney e7c3afb7f1 CLI tool for exporting apps, tidy up 2020-09-29 10:32:42 +01:00
Martin McKeaveney c2321797f1 async templates working from S3 2020-09-28 17:04:08 +01:00
mike12345567 b24ff486d8 Some groundwork for the linked records, building up a much more in-depth emitter for models and records to drive the record cleanup. 2020-09-25 18:05:26 +01:00
mike12345567 088c7440b6 Merge branch 'contextual-workflows' of github.com:Budibase/budibase into rename-workflow-automation 2020-09-21 14:49:15 +01:00
mike12345567 9274556a1b Fixing linting. 2020-09-21 14:48:24 +01:00
mike12345567 5f2acaff01 Merge branch 'contextual-workflows' of github.com:Budibase/budibase into rename-workflow-automation 2020-09-21 14:01:00 +01:00
mike12345567 b2d06b7a06 Merge branch 'master' of github.com:Budibase/budibase into contextual-workflows 2020-09-21 13:52:26 +01:00
mike12345567 88d22baf1a Renaming workflows -> automate/automations, throughout the API and the builder itself. 2020-09-21 13:49:34 +01:00
Martin McKeaveney 14283a7b96 return processed file sizes 2020-09-18 11:01:39 +01:00
Martin McKeaveney bb2058a010 lint 2020-09-17 16:36:39 +01:00
mike12345567 8477ad8727 Changing how default inputs for workflow definitions are handled and providing pretty print options for enums. 2020-09-17 12:44:59 +01:00
mike12345567 0c1ff2fd70 Fixing a circular dependency that meant a utilities enumerations could not be used until full system initialisation, exporting enums earlier and commenting. 2020-09-16 14:58:30 +01:00
mike12345567 e2791d832b This is a breaking change, it updates the block definitions to work with the new structure of inputs and outputs. 2020-09-15 14:27:23 +01:00
Michael Shanks 3a5d2f8713 remove references to material design components 2020-08-14 11:21:52 +01:00
Martin McKeaveney bbcb282e53
Cypress Tests Running in CI (#524) 
* cypress test setup

* running cypress in CI

* fixing tests after first time setup wizard

* bb api key

* API Key in right place

* adding env in cypress.json

* env var in setup

* lint

* API key not working

* fill in API key form if present

* allow more time for creation

* cypress server for debug

* video recording, better debugging

* Adding debug logs

* set node env

* cypress env

* cancel irrelevant test
 2020-08-05 15:18:28 +01:00
Michael Shanks 6f851ac489 bugfix: create app pointing to hardcoded standard-components version 2020-08-03 15:28:45 +01:00
Michael Shanks 3b4c68163d can delete screens 2020-07-21 15:01:32 +01:00
Martin McKeaveney 63c5cd9af4 lint ✨ 2020-07-14 21:10:51 +01:00
Martin McKeaveney 71fc36ec7e download component libraries from NPM tarball 2020-07-14 21:07:53 +01:00
Michael Shanks 10b0f8c379 fix: create app failing from unknown folder copy issues 2020-07-14 07:02:46 +01:00
Martin McKeaveney 2673acd46e beta bugfixes 2020-07-10 16:17:12 +01:00
Michael Shanks f2e5ca3b93 Default app template - added screens 2020-07-09 14:47:54 +01:00
Martin McKeaveney 7b57f0ecc1 merge 2020-07-07 21:32:32 +01:00
Martin McKeaveney 3122334c35 lint ✨ 2020-07-07 21:29:20 +01:00
Martin McKeaveney 8ae6f04290 extra index template for production 2020-07-06 19:43:40 +01:00
Michael Shanks 877a9b1033 Login: allow edit of title & button text 2020-07-06 11:30:36 +01:00
Michael Shanks c57b30efdf more understandable screenslot & default header on master screen 2020-07-03 21:48:34 +01:00
Michael Shanks 2bf5702bca #416 auto init of budibase when electron starts 2020-07-03 13:03:50 +01:00
Martin McKeaveney 5cc358e496 deployment E2E 2020-07-02 23:22:20 +01:00
Michael Shanks 30f311eaea apply border-box globally 2020-07-01 11:28:41 +01:00
Michael Shanks 2e576800c4 bugfix: add inter and roboto mono fonts 2020-06-29 10:16:19 +01:00
Michael Shanks 3692b92e5b merge from master 2020-06-26 15:41:42 +01:00
Conor_Mack 08524ab5d8
Merge pull request #392 from Budibase/bugfix/instance-name-login-template 
Add _instanceName to login template
 2020-06-26 10:35:42 +01:00
Conor_Mack fcdfddf6da Add _instanceName to login template 2020-06-26 10:31:03 +01:00
Michael Shanks 8ce26a1e19 bugfix: master screen not styleable 2020-06-25 17:46:43 +01:00
Michael Shanks ec1c9c5fb8 merge from master 2020-06-24 18:05:49 +01:00
Martin McKeaveney 6cdd933d09
Merge pull request #367 from Budibase/backend-ui-update 
Backend ui update
 2020-06-24 17:33:22 +01:00
Michael Shanks ef3e802fad Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-24 17:19:29 +01:00
Conor_Mack 9898ee0b99
Merge pull request #360 from Budibase/builder/consolidating-missing-code 
Instance name fix and consolidation of code
 2020-06-24 17:11:08 +01:00
Martin McKeaveney 65d0454377 merge 2020-06-24 17:02:38 +01:00
Michael Shanks 8b9c596fdc Merge branch 'master' of github.com:Budibase/budibase 2020-06-24 16:42:41 +01:00
Joe 5b600c4f2b
Merge branch 'master' into Css-update-to-reflect-BBUI 2020-06-24 15:35:40 +01:00
Michael Shanks 4b801f3f37 screenslot added to Private>Master by default 2020-06-24 11:05:09 +01:00
Conor_Mack 6eebeb6692
Merge branch 'master' into builder/consolidating-missing-code 2020-06-23 11:21:31 +01:00
Joe a77be47076 CSS update UI refresh 
Font changed to Inter
Colors reflect BBUI
Panel background removed
 2020-06-23 08:19:16 +01:00
Martin McKeaveney 6adb2a72e0 merge 2020-06-22 22:39:41 +01:00
Martin McKeaveney 1b1b804bbd bidirectional linked records 2020-06-22 21:30:23 +01:00
Michael Shanks d7b09f5b65 removed x-user-agent 2020-06-19 16:59:46 +01:00
Martin McKeaveney 9cdb6554a5 typo 2020-06-18 17:49:34 +01:00
Michael Shanks bf952f8677 instanceid removal 2020-06-18 16:59:31 +01:00
Martin McKeaveney 48f6ac2b98 structuring new backend UI 2020-06-15 16:41:31 +01:00
Conor_Mack 47d38f2a28 Lint fixes 2020-06-15 16:02:11 +01:00
Conor_Mack 8b99546326 Instance naming fix for components and screens 2020-06-15 16:01:24 +01:00
Michael Shanks bf1da9e94e removal of appRoot - appId comes in cookie 2020-06-12 20:42:55 +01:00
Michael Shanks 32d1ca641b bugfix: data components hitting correct url again 2020-06-03 22:12:09 +01:00
Michael Shanks 47f80b24f7 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 15:43:53 +01:00
Michael Shanks 77a16f95da autu populated login page 2020-06-03 15:43:37 +01:00
Kevin Åberg Kultalahti b8df2f15fb
Merge pull request #309 from Budibase/bugfix/navbar-settings 
Bugfix/navbar settings
 2020-06-03 14:59:35 +02:00
kevmodrome dba1ff1de1 adds another color to Nav Bar and also adds roboto as default font in created apps 2020-06-03 14:52:18 +02:00
Michael Shanks 0c2d7a7c66 bugfix: links not respecting appRootPath 2020-06-03 12:30:32 +01:00
Michael Shanks 14153a4c90 bugfix: could not set style on screen root 2020-06-02 16:18:25 +01:00
Martin McKeaveney 398f200661 merge 2020-06-01 16:27:27 +01:00
Martin McKeaveney 65d0161007 orchestrator refactor, user creation block 2020-05-30 13:41:46 +01:00
Martin McKeaveney bba7b93b75 refactor client library 2020-05-29 14:06:36 +01:00
Michael Shanks 2f1fc8109b few changes from code review 2020-05-27 17:37:07 +01:00
Michael Shanks 3bfe7840e4 access levels 2020-05-27 17:23:01 +01:00
Michael Shanks b7ad4de09e server - create app endpoint creates files 2020-05-26 16:29:16 +01:00
Michael Shanks 1b87edc954 auth, first version, needing tested 2020-05-21 14:31:23 +01:00
Martin McKeaveney c8dd48b507 formatting 2020-05-18 11:01:17 +01:00
Michael Shanks 18375a6d19 server tests in-memory and passing 2020-05-14 15:12:30 +01:00
Martin McKeaveney 947ffa326f
Merge branch 'master' into fix-dev-setup 2020-05-11 16:40:39 +01:00
Martin McKeaveney cc30913e34 fixed dev setup 2020-05-11 16:01:02 +01:00
Michael Shanks a004aa5838 allow bb home folder to bem anywhere 2020-05-11 15:42:42 +01:00
Martin McKeaveney 5646ef1101 fixing tests 2020-05-07 22:25:27 +01:00
Martin McKeaveney 94b2e0f134 further tidy up and removal 2020-05-07 13:52:24 +01:00