Commit Graph

624 Commits

Author SHA1 Message Date
Adria Navarro e7bcabf1d2 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-27 20:48:32 +01:00
mike12345567 3228463749 Merge branch 'master' of github.com:Budibase/budibase into labday/sqs 2023-11-17 17:23:25 +00:00
Adria Navarro e8abb5cb46 Detect non-barrel workspace usages 2023-11-17 14:39:52 +01:00
Adria Navarro ab56228192 Use eslint-plugin-import and import/no-relative-packages 2023-11-17 13:03:28 +01:00
Adria Navarro 004e0a5f11 Update jest 2023-11-06 14:24:33 +01:00
Adria Navarro d568957c1d Clean unused packages 2023-11-06 10:43:21 +01:00
Andrew Kingston 819df964bc Fix style issues in client apps and remove extraneous dependencies 2023-11-03 11:18:03 +00:00
Andrew Kingston afffd4d234 Add initial version of new date picker without time support 2023-11-02 15:37:18 +00:00
Adria Navarro 042254d3ac Install dependencies 2023-10-31 15:21:40 +01:00
Adria Navarro 3ed2aa1d77 Revert major update 2023-10-27 16:59:49 +02:00
Adria Navarro 09075b4347 Update @budibase/nano 2023-10-27 16:37:36 +02:00
Adria Navarro d28593dea4 Update yarn.lock 2023-10-27 16:24:17 +02:00
Adria Navarro 3272a5c6e3 Revert major update 2023-10-27 15:35:52 +02:00
Adria Navarro a56babd83a Revert major update 2023-10-27 15:32:57 +02:00
Adria Navarro cb6c9f6ecb Update nano 2023-10-27 15:11:16 +02:00
Adria Navarro 68a476de30 Unify jest 2023-10-27 13:58:59 +02:00
Adria Navarro 4b7cfa9e5a Dedup 2023-10-27 13:51:44 +02:00
Adria Navarro c79f37ee9c Update eslint packages 2023-10-27 12:14:21 +02:00
Adria Navarro c072c2da47 Update vite packages 2023-10-27 11:07:58 +02:00
Adria Navarro 6abb1b5f70 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-27 10:57:07 +02:00
Sam Rose ae356b6a50
Bump version of @budibase/nano to complete the DatabaseQueryOpts type usage. 2023-10-26 15:51:28 +01:00
mike12345567 4dde6c3e2f Merge branch 'master' of github.com:Budibase/budibase into labday/sqs 2023-10-20 13:18:07 +01:00
mike12345567 fdfd58391a Merge branch 'master' of github.com:Budibase/budibase into labday/sqs 2023-10-19 18:25:11 +01:00
Adria Navarro 3851a67915 Unify jsonwebtoken and lodash packages 2023-10-19 11:00:53 +02:00
Adria Navarro 3fd2973152 Remove sentry packages 2023-10-18 10:51:09 +02:00
Adria Navarro 4f1a2df495 Deps 2023-10-18 10:50:18 +02:00
Adria Navarro 28d84309d8 Remove sentry dependencies 2023-10-18 10:50:18 +02:00
Adria Navarro f556ced459 Update yarn 2023-10-18 10:50:18 +02:00
Adria Navarro ac9c99aebc Remove sentry packages 2023-10-18 10:50:18 +02:00
Adria Navarro 9838c368eb Unify more packages 2023-10-18 10:49:15 +02:00
Adria Navarro dd526c92e6 Unify supertest 2023-10-18 10:49:15 +02:00
Adria Navarro 0f862088d2 Unify lodash 2023-10-18 10:49:15 +02:00
Adria Navarro c9b7c861f4 Unify packages 2023-10-18 10:49:15 +02:00
Adria Navarro d49bef22b1 Unify packages 2023-10-18 10:49:15 +02:00
Adria Navarro 9cecebff32 Unify aws-sdk 2023-10-18 10:49:15 +02:00
Adria Navarro ae729e4466 Fix tests 2023-10-18 10:49:15 +02:00
Adria Navarro f408d45fba Clean 2023-10-18 10:49:15 +02:00
Adria Navarro 2015977ef1 Fix yarn.lock 2023-10-18 10:49:15 +02:00
Adria Navarro 8098b4867b Use local packages 2023-10-18 10:49:15 +02:00
Adria Navarro 246808fc28 Update refs 2023-10-18 10:49:15 +02:00
Adria Navarro 9dfeee747a Setup account-portal as submodule 2023-10-18 10:49:15 +02:00
mike12345567 c036a76346 Fixing yarn lock/ 2023-10-17 16:23:23 +01:00
mike12345567 b267e4ca28 Merge branch 'master' of github.com:Budibase/budibase into labday/sqs 2023-10-17 14:53:09 +01:00
Adria Navarro dc4fc27fc8 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 10:38:09 +02:00
mike12345567 6bbce23910 Updating user fetch functionality to send up lucene syntax for searching to global user endpoint. 2023-10-12 16:31:32 +01:00
mike12345567 7b8e23eb82 Merge branch 'master' of github.com:Budibase/budibase into BUDI-7573/use_existing_image_cache 2023-10-12 11:08:12 +01:00
mike12345567 f958832e86 Removing dupe vm2 2023-10-11 18:48:04 +01:00
mike12345567 7090819752 Updating version of VM2 to ^3.9.19 - due to possible RCE issue with Promises (we do not allow async code, but there still could be a risk). 2023-10-11 18:43:25 +01:00
mike12345567 ff89a15eea Updating jest types - old version was causing some weird errors in Webstorm. 2023-10-10 18:12:28 +01:00
Adria Navarro 19254a3f8d Update rollup 2023-10-06 12:31:37 +02:00
Adria Navarro c60de3ebe0 Update vite dependencies 2023-10-06 12:29:12 +02:00
Adria Navarro 18545b1c79 Fix vulnerabilities 2023-10-03 23:45:39 +02:00
Adria Navarro 97761de473 yarn audit fix 2023-10-03 23:13:26 +02:00
Adria Navarro 15fd357b54 Update @google-cloud/firestore (yarn audit) 2023-10-03 23:09:57 +02:00
Adria Navarro 9dd5530c4e More cleanups 2023-10-03 22:39:00 +02:00
Adria Navarro 16752bb437 More cleanups 2023-10-03 22:37:00 +02:00
Adria Navarro cab660d2e3 Clean dependencies 2023-10-03 22:11:43 +02:00
mike12345567 1db95a3006 Merge branch 'develop' of github.com:Budibase/budibase into labday/sqs 2023-10-02 16:32:10 +01:00
Adria Navarro 653e29d678 Fix conflicting svelte version (conflicting on lint) 2023-09-26 17:47:12 +02:00
Adria Navarro 4f2db7aeb1 Dedupe yarn.lock 2023-09-26 17:22:30 +02:00
Adria Navarro 3b124f66ac Dedupe yarn.lock 2023-09-26 17:19:55 +02:00
Adria Navarro 033bb72563 Dedupe yarn.lock 2023-09-26 17:16:32 +02:00
Adria Navarro f781f928ba Dedupe yarn.lock 2023-09-26 17:15:01 +02:00
Adria Navarro f0e0aa26d6 Dedupe yarn.lock 2023-09-26 17:13:19 +02:00
Adria Navarro ba24504546 Remove "@budibase/standard-components" devDependency 2023-09-26 17:06:05 +02:00
Adria Navarro d006ec890a Dedupe babel 2023-09-26 17:02:54 +02:00
Adria Navarro c68cfc5042 Remove unused devDependencies on worker 2023-09-26 16:37:10 +02:00
Adria Navarro 30af3e4c10 Remove unused koa dependencies 2023-09-26 16:17:41 +02:00
Adria Navarro ebb3966092 Remove unused devDependencies on server 2023-09-26 16:10:43 +02:00
Adria Navarro 7c5f13a12b Remove unused dependencies on server 2023-09-26 16:07:52 +02:00
Adria Navarro ba2eb80684 Remove unused devDependencies on cli 2023-09-26 16:05:44 +02:00
Adria Navarro 12aa6bc119 Remove unused dependencies on cli 2023-09-26 13:21:52 +02:00
Adria Navarro 463a035793 Remove builder unused devDependencies 2023-09-26 13:15:42 +02:00
Adria Navarro 31974834a0 Remove builder unused dependencies 2023-09-26 13:13:52 +02:00
Adria Navarro 1fdb822699 Missing dependencies 2023-09-26 13:09:16 +02:00
Adria Navarro d61564155d Clean dependencies from bbui 2023-09-26 12:53:10 +02:00
Adria Navarro 693b00fbcf Clean dependencies from types 2023-09-26 12:53:10 +02:00
Adria Navarro 1acbcaa4d8 Clean dependencies from sdk 2023-09-26 12:53:09 +02:00
Adria Navarro a13aef1c16 Fix dependencies from backend-core 2023-09-26 12:53:09 +02:00
Adria Navarro 7feaf58f7f Fix dependencies from backend-core 2023-09-26 12:53:09 +02:00
Adria Navarro aee590bbba Update lint 2023-09-25 09:42:48 +02:00
Adria Navarro 02ab0a134e Update ts to 5.x 2023-09-22 18:17:19 +02:00
Andrew Kingston bd5c6056d8 Update dayjs dependencies to same version and fix import syntax in DateCell 2023-09-15 08:04:17 +01:00
mike12345567 aeac7aaa0c Making sure that not all falsy values are considered invalid filter inputs. 2023-09-12 13:54:39 +01:00
Adria Navarro 3b69acc166 Merge branch 'develop' into update-node-types 2023-09-07 19:50:39 +02:00
Mitch-Budibase 64ec4fe9e2 Merge branch 'develop' into account-portal-auth-api-testing-2 2023-09-07 16:39:37 +01:00
Adria Navarro 0f9552560b yarn.lock 2023-09-07 15:34:58 +02:00
Adria Navarro f691987e65 Update node types 2023-09-07 11:21:41 +02:00
Mitch-Budibase 178b807573 Merge branch 'develop' into account-portal-auth-api-testing-2 2023-08-30 15:14:48 +01:00
mike12345567 7110351bdc Revert "revert develop into master"
This reverts commit fd099658a0.
2023-08-18 14:33:21 +01:00
Martin McKeaveney fd099658a0 revert develop into master 2023-08-17 10:28:15 +01:00
melohagan a8b3249a8f Add bindable setting for initial form step (#11530) 2023-08-16 15:59:02 +01:00
jvcalderon 989bfe76fb Merge branch 'develop' into account-portal-auth-api-testing-2 2023-08-02 17:44:01 +02:00
Adria Navarro bf2f0b5c3a Sync posthog-node package 2023-08-01 14:16:37 +02:00
jvcalderon 17980d4bcc Merge account-portal-auth-api-testing 2023-07-31 16:09:45 +02:00
Adria Navarro 6d5eef4e42 Update 2023-07-28 17:11:48 +02:00
Adria Navarro baf1c1ff07 Update swc deps 2023-07-28 17:11:48 +02:00
Adria Navarro 5f1565886f Unify jest 2023-07-28 17:11:48 +02:00
mike12345567 43024e1a30 Merge branch 'develop' of github.com:Budibase/budibase into labday/sqs 2023-07-26 14:40:49 +01:00
Adria Navarro de0f3f7463 Merge branch 'develop' into backmerge-master-20230726 2023-07-26 12:50:52 +01:00
Adria Navarro ed1344b046 Fix lint 2023-07-26 13:17:01 +02:00
Adria Navarro ae661b50e5 Update yarn.lock 2023-07-26 12:51:16 +02:00
Adria Navarro b488dd06a3 Update esbuild refs 2023-07-26 12:47:35 +02:00
mike12345567 c185dd7dd0 Merge branch 'develop' of github.com:Budibase/budibase into labday/sqs 2023-07-21 18:41:48 +01:00
mike12345567 5447404431 Upgrading to latest version of MongoDB to attempt to solve the memory leak, as well as some minor changes to websocket integration to get the development environment to work without the account portal when running in multi-tenancy mode. 2023-07-20 10:43:17 +01:00
Martin McKeaveney 7afd77065f updating versionCommit tag 2023-07-19 14:57:48 +01:00
Michael Drury 54bbe9e584 Merge pull request #11254 from Budibase/fix/mongodb-version-upgrade
Upgrade MongoDB version and quick fix for multi-tenancy mode without account portal
2023-07-18 11:33:15 +01:00
mike12345567 eebd9d2d7c Upgrading to latest version of MongoDB to attempt to solve the memory leak, as well as some minor changes to websocket integration to get the development environment to work without the account portal when running in multi-tenancy mode. 2023-07-17 17:52:39 +01:00
Adria Navarro ff67df8e79 Rotate logs 2023-07-11 10:44:09 +02:00
Adria Navarro 711fb7b5c9 Downgrade nx to support node 14 2023-07-10 12:21:05 +02:00
Adria Navarro f45f1567a5 Update lerna 2023-07-10 12:18:07 +02:00
Adria Navarro 39efd01f23 Update nx 2023-07-10 11:41:46 +02:00
Adria Navarro fcfa9027ef Update yarn.lock 2023-07-10 11:03:10 +02:00
Adria Navarro 5cdb7fb4b8 Merge branch 'develop' into chore/nx-cloud 2023-07-10 10:56:31 +02:00
mike12345567 f7a60bc65a Some minor improvements while working on documenting the outcomes. 2023-07-07 13:47:42 +01:00
Gerard Burns 808e0d1ef2 Linting improvements (#11119) 2023-07-05 18:00:50 +01:00
Adria Navarro 85caaa38d5 Update yarn.lock 2023-07-05 16:01:28 +02:00
Adria Navarro ae87f8c689 Update access token 2023-07-05 15:58:03 +02:00
Adria Navarro d6ca78cb82 Use nx cloud 2023-07-05 15:58:03 +02:00
Adria Navarro 8db5b87136 Update prettier 2023-06-28 14:39:17 +01:00
Adria Navarro f2d41addbd Unify prettier 2023-06-28 14:33:51 +01:00
Adria Navarro b075f4db1b Yarn.lock 2023-06-28 14:33:51 +01:00
Adria Navarro 94b084a245 Update mssql to latest 2023-06-28 14:33:51 +01:00
Adria Navarro 1e5492b18d Type mssql 2023-06-28 14:33:51 +01:00
Adria Navarro 24d5d36cff Add dependencies on scripts 2023-06-26 11:54:24 +01:00
Adria Navarro 0f0b1a5eda Update pro refs 2023-06-26 10:45:45 +01:00
Adria Navarro 50d082c385 Merge branch 'develop' into chore/refactor_pro_as_package 2023-06-20 11:14:05 +01:00
Adria Navarro b85c252e58 Merge pull request #10958 from Budibase/budi-7048/update-to-lerna-7
BUDI-7048 - update to lerna 7
2023-06-19 19:37:06 +01:00
Adria Navarro acfe69a3d5 Remove the doble deep format references 2023-06-19 18:34:51 +01:00
Adria Navarro b0f40be409 Update bcrypt 2023-06-19 17:55:47 +01:00
Adria Navarro fdba5bf3ae Exclude package dependencies 2023-06-19 17:55:47 +01:00
Adria Navarro e73934a09c Clean packages 2023-06-19 17:55:47 +01:00
Adria Navarro b3a6a2e13a Remove nx dependency, use lerna instead 2023-06-19 17:50:52 +01:00
Adria Navarro cf4c57a61b Revert "BUDI-7048 - Update to lerna 7" 2023-06-16 15:25:34 +01:00
Adria Navarro bc82f95410 Update nx to latest 2023-06-15 11:48:49 +01:00
Adria Navarro 7f9891b5a7 Update lerna out of beta 2023-06-15 11:48:12 +01:00
Adria Navarro 9832da4067 Merge branch 'develop' into budi-7010-encrypt-app-exports 2023-06-14 14:40:10 +01:00
Adria Navarro 3aaaad8792 Update mongodb 2023-06-13 10:48:42 +01:00
Adria Navarro d7f64fe6a4 Update tar libs 2023-06-12 11:12:22 +01:00
melohagan c0578d4cc2 Send meeting invite via automation email smtp (#10787)
* Pass calendar props into sendSmtpEmail

* Add calendar event to message

* Add Checkbox and DatePicker automation field UI

* Add URL prop

* Add url to sendSmtpEmail unit test

* Refactor

* Code review comments

* Make location optional

* Add EmailInvite type

---------

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
2023-06-08 14:25:35 +01:00
Michael Drury 13d987023a Updating ioredis to latest version and removing typing library as no longer required. 2023-06-01 10:39:16 +01:00
Michael Drury fde94a262f Moving ioredis-mock dependency back to dev dependency in backend-core. 2023-06-01 10:13:54 +01:00
Michael Drury a3f9759a47 Reverting ioredis-mock removal for test cases - will come back to this in future as it currently breaks pro tests. 2023-06-01 00:02:55 +01:00
Michael Drury d376611c4c Merge branch 'develop' of github.com:Budibase/budibase into fix/datasource-info-endpoint 2023-05-31 23:39:53 +01:00
deanhannigan 8c144bbe2c Merge pull request #10732 from Budibase/feature/binding-v2-updates
Binding V2 Updates
2023-05-31 19:15:20 +01:00
Dean 853e5cff7d PR Feedback fix 2023-05-31 19:01:47 +01:00
mike12345567 249625ad1a Updating backend tests to actually utilise the redis container which is spun up as part of the tests, doing away with the somewhat problematic ioredis-mock which was breaking some tests due to the addition of the changes for multi-dev collab. 2023-05-31 17:18:01 +01:00
Martin McKeaveney 7cc6fe44fb Merge pull request #10697 from Budibase/dependabot/npm_and_yarn/webpack-5.84.0
Bump webpack from 5.75.0 to 5.84.0
2023-05-31 11:44:23 +01:00
Martin McKeaveney eae5ecb163 Merge pull request #10678 from Budibase/dependabot/npm_and_yarn/socket.io-parser-4.2.3
Bump socket.io-parser from 4.2.2 to 4.2.3
2023-05-31 11:44:13 +01:00
Dean cd95df629e Merge remote-tracking branch 'origin/develop' into feature/binding-v2-updates 2023-05-31 11:07:47 +01:00
Rory Powell 6230e62b9b Automation investigation logging + max doc size fix for automation log 2023-05-30 16:37:39 +01:00
Andrew Kingston cc53719c52 Refactor client lib websocket usage to match other usages 2023-05-30 11:21:37 +01:00
Andrew Kingston be40d72f55 Merge pull request #10712 from Budibase/data-section-multidev
Multiple user collaboration for data section
2023-05-30 09:08:14 +01:00
Dean 0730c15b14 Merge remote-tracking branch 'origin/develop' into feature/binding-v2-updates 2023-05-28 22:29:47 +01:00
Adria Navarro 7a439b8e01 Remove nx/esbuild refs 2023-05-26 13:59:50 +02:00
Andrew Kingston 520158c8f9 Merge branch 'develop' of github.com:Budibase/budibase into data-section-multidev 2023-05-26 09:39:06 +01:00
Adria Navarro ee0fc258cb Update yarn.lock 2023-05-26 10:11:18 +02:00
Adria Navarro 35d5df7ef0 Use local refs 2023-05-26 10:10:55 +02:00
Dean 7a874e67d3 Merge remote-tracking branch 'origin/develop' into feature/binding-v2-updates 2023-05-25 18:34:57 +01:00
dependabot[bot] 7eb93388ca Bump webpack from 5.75.0 to 5.84.0
Bumps [webpack](https://github.com/webpack/webpack) from 5.75.0 to 5.84.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.75.0...v5.84.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-25 12:41:19 +00:00
dependabot[bot] 09934f8293 Bump socket.io-parser from 4.2.2 to 4.2.3
Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.2.2 to 4.2.3.
- [Release notes](https://github.com/socketio/socket.io-parser/releases)
- [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io-parser/compare/4.2.2...4.2.3)

---
updated-dependencies:
- dependency-name: socket.io-parser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-25 12:41:10 +00:00
Martin McKeaveney 8061c700c6 Merge pull request #10425 from Budibase/feature/chatgpt-automationblock
Feature/chatgpt automationblock
2023-05-25 13:39:57 +01:00
Adria Navarro bdda73a70b Respect tsconfig paths 2023-05-25 11:49:38 +02:00
Andrew Kingston 5e480a1527 Use socker.io redis adapter to broadcast events to all server instances 2023-05-25 08:48:56 +01:00
Martin McKeaveney 77c2e309dd merge 2023-05-24 17:35:04 +01:00
Dean 0dae8e0eb1 Merge remote-tracking branch 'origin/develop' into feature/binding-v2-updates 2023-05-24 14:30:42 +01:00
Martin McKeaveney bbab2a9adc merge 2023-05-24 11:25:49 +01:00
Adria Navarro c3301e393e Optimise nx dependencies 2023-05-23 23:11:26 +02:00
mike12345567 9d3d29f43a Setting version and adding types dependency to backend-core. 2023-05-23 18:21:47 +01:00
Adria Navarro 3d604f780a Fix build order 2023-05-23 19:00:56 +02:00
Adria Navarro 077e6895da Undo package 2023-05-19 17:37:16 +02:00
Adria Navarro f27c4ae55a Use nx/esbuild for worker docker & dev 2023-05-19 14:45:05 +02:00
Dean 8ad4ed7d34 Merge remote-tracking branch 'origin/develop' into feature/binding-v2-updates 2023-05-19 09:11:35 +01:00
Dean 2e28a6d312 Yarn lock updates 2023-05-19 09:11:12 +01:00
Adria Navarro 2d2d50a5df Merge branch 'develop' into chore/esbuild 2023-05-18 11:34:11 +02:00
Adria Navarro 04a28c761b Merge branch 'develop' into feature/datasource-conns 2023-05-17 15:23:23 +02:00
mike12345567 f3785892a9 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-05-17 12:45:28 +01:00
Andrew Kingston e2bf3b32e1 Revert flatpickr version to fix bug in 3.3.2, improve display of time-only dates 2023-05-16 14:52:45 +01:00
Adria Navarro 640911f1dd Update pg deps 2023-05-15 13:16:56 +02:00
Adria Navarro f0194ac96b Pro referencing 0.0.1 2023-05-10 12:39:24 +02:00
mike12345567 c880282be3 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-05-05 15:44:32 +01:00
Budibase Release Bot c73f9eb12f Update pro version to 2.6.7 2023-05-05 14:31:33 +00:00
Adria Navarro 1c0da8ff29 Merge branch 'develop' into chore/npmless-builds 2023-05-05 13:31:45 +01:00
Adria Navarro 09462974e1 Use semver 2023-05-05 13:23:14 +01:00
Budibase Release Bot 83dabb6fc4 Update pro version to 2.6.6 2023-05-05 11:52:37 +00:00
Budibase Staging Release Bot 21ffea56c4 Update pro version to 2.5.10-alpha.3 2023-05-05 11:20:50 +00:00
Budibase Release Bot cd08227d21 Update pro version to 2.6.5 2023-05-05 11:20:15 +00:00
Budibase Release Bot 488ce6c072 Update pro version to 2.6.4 2023-05-05 10:49:18 +00:00
Budibase Release Bot 541c5ef1c2 Update pro version to 2.6.3 2023-05-05 06:59:33 +00:00
Budibase Release Bot 303a029184 Update pro version to 2.6.2 2023-05-04 13:34:48 +00:00
Budibase Release Bot cde5259e44 Update pro version to 2.6.1 2023-05-04 10:40:47 +00:00
Budibase Release Bot 2cbae832c4 Update pro version to 2.6.0 2023-05-04 10:02:34 +00:00
Adria Navarro ce0d527d75 Merge branch 'chore/npmless-builds' into chore/pipeline_npm_version_updates
# Conflicts:
#	packages/backend-core/package.json
#	packages/bbui/package.json
#	packages/builder/package.json
#	packages/cli/package.json
#	packages/client/package.json
#	packages/frontend-core/package.json
#	packages/sdk/package.json
#	packages/server/package.json
#	packages/shared-core/package.json
#	packages/string-templates/package.json
#	packages/types/package.json
#	packages/worker/package.json
#	yarn.lock
2023-05-04 10:29:45 +01:00
Budibase Release Bot dd07f979f9 Update pro version to 2.5.10 2023-05-04 07:55:58 +00:00
dependabot[bot] dbd101733f Bump engine.io from 6.4.1 to 6.4.2
Bumps [engine.io](https://github.com/socketio/engine.io) from 6.4.1 to 6.4.2.
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/6.4.1...6.4.2)

---
updated-dependencies:
- dependency-name: engine.io
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-04 01:53:57 +00:00
Budibase Staging Release Bot 77116bf4c2 Update pro version to 2.5.10-alpha.1 2023-05-03 17:30:27 +00:00
Adria Navarro c3878d37f2 Update pro refs 2023-05-03 18:11:09 +01:00
Adria Navarro 1d78e4d7f3 Update yarn.lock 2023-05-03 18:05:32 +01:00
Adria Navarro cec2f88c25 Fix svelte issues 2023-05-03 18:05:32 +01:00
Adria Navarro 648db248dc Fix builds 2023-05-03 18:05:32 +01:00
Adria Navarro d7f7ad5b5f Build shared-core 2023-05-03 18:05:21 +01:00
Adria Navarro a7f69231d9 Merge branch 'chore/npmless-builds' into chore/esbuild 2023-05-03 18:01:04 +01:00
Adria Navarro ba41fe97e1 Merge branch 'develop' into chore/npmless-builds 2023-05-03 18:00:12 +01:00
Rory Powell 47a37edad7 Update lockfiles 2023-05-03 16:10:22 +01:00
Rory Powell e1a147e823 Merge branch 'master' into develop 2023-05-03 16:06:42 +01:00
Budibase Staging Release Bot eb973386d8 Update pro version to 2.5.6-alpha.45 2023-05-03 13:16:23 +00:00
Budibase Staging Release Bot ecff055b3e Update pro version to 2.5.6-alpha.44 2023-05-02 18:11:31 +00:00
mike12345567 5758120ecc Minor updates to CLI - incrementing docker-compose version as per #10222 as well as a fix for prebuilds when using pkg version. 2023-05-02 14:58:34 +01:00
Adria Navarro f426ba1ac3 Merge branch 'chore/npmless-builds' into chore/esbuild 2023-05-02 14:56:34 +01:00
Adria Navarro 00cd09d6d4 Merge branch 'develop' into chore/npmless-builds 2023-05-02 14:47:03 +01:00
Rory Powell 38d0fd943a Remove business minimum quantity from backend 2023-04-29 22:06:41 +01:00
Rory Powell 26fb217850 Add licenseRequestedAt time to license type 2023-04-28 22:40:06 +01:00
Rory Powell 0b88848277 Lint 2023-04-28 11:24:05 +01:00
mike12345567 71f2287474 Merge branch 'develop' of github.com:Budibase/budibase into fix/export-no-auto-logs 2023-04-27 16:44:26 +01:00
Budibase Staging Release Bot bea67941fe Update pro version to 2.5.6-alpha.38 2023-04-27 15:18:15 +00:00
Budibase Staging Release Bot a896a75f8f Update pro version to 2.5.6-alpha.37 2023-04-27 13:48:47 +00:00
mike12345567 5363693ac3 Removing automation logs from app exports as they are not useful - they take up space and the imported app won't have ran any automations yet. I have added it as a flag so that this does not affect backups (as you would want to maintain logs for backups). 2023-04-27 11:36:52 +01:00
Budibase Staging Release Bot 1b815c363a Update pro version to 2.5.6-alpha.36 2023-04-27 09:32:55 +00:00
Budibase Staging Release Bot d6e5647b89 Update pro version to 2.5.6-alpha.35 2023-04-27 07:36:01 +00:00
Budibase Staging Release Bot 34b0a1fa2d Update pro version to 2.5.6-alpha.34 2023-04-26 16:17:58 +00:00
Martin McKeaveney 84f52683b2 chatgpt automation block 2023-04-26 15:55:44 +01:00
Dean 64a4423c62 Merge remote-tracking branch 'origin/develop' into fix/client-versioning 2023-04-26 14:59:03 +01:00
Budibase Staging Release Bot 71c8fec4db Update pro version to 2.5.6-alpha.32 2023-04-26 13:48:46 +00:00
Dean dbd73a1135 Merge remote-tracking branch 'origin/develop' into fix/client-versioning 2023-04-26 14:25:09 +01:00
Dean 13134e0bb0 Removed client package from builder dependencies 2023-04-26 14:22:23 +01:00
Budibase Staging Release Bot 349f4b426e Update pro version to 2.5.6-alpha.31 2023-04-26 12:18:01 +00:00
Budibase Staging Release Bot 3e78989e74 Update pro version to 2.5.6-alpha.30 2023-04-25 19:46:09 +00:00
Rory Powell aee52af7f0 Add feature and quota overrides to qa core for cloud tests (#10417)
* Fix qa core suite

* Update package.json

* Lint
2023-04-25 20:36:27 +01:00
Budibase Staging Release Bot 71fcfa1a02 Update pro version to 2.5.6-alpha.29 2023-04-25 16:54:16 +00:00
mike12345567 19b568891e Merge branch 'develop' of github.com:Budibase/budibase into chore/npmless-builds 2023-04-25 17:44:17 +01:00
mike12345567 49b45f5e67 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-25 17:37:56 +01:00
Budibase Staging Release Bot 3f22bbf50d Update pro version to 2.5.6-alpha.28 2023-04-25 10:51:34 +00:00
Budibase Staging Release Bot c08db11859 Update pro version to 2.5.6-alpha.26 2023-04-24 19:16:43 +00:00
adrinr 452e7b6ecd Update yarn.lock 2023-04-24 20:02:43 +01:00
adrinr e09e1c8627 Use local pro 2023-04-24 20:01:59 +01:00
adrinr 9387d37d3b Use 0.0.1 2023-04-24 20:00:22 +01:00
adrinr ad547f32e2 Add latest back 2023-04-24 20:00:22 +01:00
adrinr 92115c5b95 Remove latest references 2023-04-24 19:59:46 +01:00
adrinr 25bc89a9b6 Remove package versions 2023-04-24 19:58:40 +01:00
mike12345567 657197b02d Updating server Dockerfile. 2023-04-24 18:24:09 +01:00
adrinr f88a655821 Update yarn.lock 2023-04-24 17:56:50 +01:00
Budibase Staging Release Bot 52d9e22fb8 Update pro version to 2.5.6-alpha.20 2023-04-24 12:47:25 +00:00
Michael Drury 1b3d92ae86 Merge pull request #10369 from Budibase/chore/pro_as_submodule
Chore - use pro as submodule
2023-04-24 13:26:30 +01:00
Budibase Staging Release Bot 053e1eae83 Update pro version to 2.5.6-alpha.19 2023-04-24 11:11:26 +00:00
Budibase Staging Release Bot 5f883ec42c Update pro version to 2.5.6-alpha.18 2023-04-24 10:39:51 +00:00
Budibase Staging Release Bot 001bd625c1 Update pro version to 2.5.6-alpha.17 2023-04-24 08:47:21 +00:00
Budibase Staging Release Bot 5dd1410a24 Update pro version to 2.5.6-alpha.16 2023-04-21 13:47:04 +00:00
Budibase Staging Release Bot 538424a469 Update pro version to 2.5.6-alpha.15 2023-04-21 11:45:04 +00:00
mike12345567 c5e1457b25 Merge branch 'develop' of github.com:Budibase/budibase into fix/budi-6900 2023-04-21 12:06:18 +01:00
Michael Drury e92864f57a Merge pull request #10361 from Budibase/dependabot/npm_and_yarn/vm2-3.9.17
Bump vm2 from 3.9.16 to 3.9.17
2023-04-21 12:04:34 +01:00
dependabot[bot] 5ec8c25414 Bump vm2 from 3.9.16 to 3.9.17
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.16 to 3.9.17.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.16...3.9.17)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-21 07:19:22 +00:00
Budibase Staging Release Bot 6d2eeff03a Update pro version to 2.5.6-alpha.13 2023-04-21 07:18:15 +00:00
dependabot[bot] 15b1cad3fa Bump nunjucks from 3.2.3 to 3.2.4
Bumps [nunjucks](https://github.com/mozilla/nunjucks) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/mozilla/nunjucks/releases)
- [Changelog](https://github.com/mozilla/nunjucks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mozilla/nunjucks/compare/v3.2.3...v3.2.4)

---
updated-dependencies:
- dependency-name: nunjucks
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-20 21:59:51 +00:00
adrinr afc5c99c6f Revert "Merge pull request #10367 from Budibase/revert-10267-chore/pro_as_submodule"
This reverts commit df18119b56, reversing
changes made to 676b85dbd8.
2023-04-20 19:48:29 +01:00
Budibase Staging Release Bot 30ba8fbc13 Update pro version to 2.5.6-alpha.12 2023-04-20 18:36:36 +00:00
adrinr e65225996e Revert https://github.com/Budibase/budibase/pull/10267 2023-04-20 19:04:20 +01:00
mike12345567 060dc05afa Removing export all apps functionality from cloud - this was a very niche feature and often confusing, now there is a consistent flow for starting out in self host. 2023-04-20 17:19:17 +01:00
Andrew Kingston 55ce83c444 Grid UI in data section (#10329)
* Add WIP spreadsheet

* Add footer and improve styles

* Refactor to use IDs and support changing text values inline

* Add inline editing of options fields

* Add row deletion and fix sizing

* Add ability to add new rows

* Fix z-index issue with option cells

* Remove deletion notification and fix selection

* Add gap between items in an options cell

* Tweak options cell to be pixel perfect

* Fix padding around sheet not working when scrolling

* Add resizable columns and add support for all themes

* Allow multiselect component and field to support text values

* Generate inclusion schema when importing multiselect columns

* Add support for multiselect type

* Add number cell

* Add functional date cell

* Disable editing autocolumns

* Make sticky column the primary display and fix opening options cells

* Improve display of relationship cell and options cell

* Support empty dates and use CSS variables for easier styling

* Use more CSS variables and add utils to spreadsheets

* Add drag and drop column reordering

* Break out reordering logic into new stores

* Rename reordering to reorder

* Break out other components from spreadsheet for cleaner code

* Break out spreadsheet body into its own component

* Split into more modular components and try virtual rendering

* Test absolute positioning

* Optimise virtual rendering for both columns and rows to handle infinitely large datasets

* Optimise scrolling and virtual rendering performance

* Fix columnn reordering

* Migrate sheet to data section, improve reordering and reszing

* Clean up more sheet state and increase performance

* Fix multiple issues with z-index, reordering and resizing

* Fix date cells in sheets

* Separate data fetching logic from main sheet and tidy up

* Add infinite scroll, improve row fetching, add error handling, fix svelte store updates

* Fix overly thin scrollbars in firefox

* Use nicer checkboxes and fix some hover styles

* Fix issue reordering columns in firefox and increase performance

* Tidy up

* Use search endpoint instead of get endpoint to fetch individual rows so that relationship enrichment occurs

* Tidy up

* Fix relationship issues when creating rows

* Optimise resetting data to smoothly transition when changing datasource

* Add WIP virtual dom implementation to massively increase performance

* Refactor spreadsheet into more discreet components

* Fix multiple issues, clean up rendering, improve performance

* Tune cell sizes

* Fix some scroll issues and add shadow to sticky column

* Fix issue when no primary display is set

* Add padding to sheet

* Improve styles

* Allow reordering columns to be the first column after sticky column

* Fix row hover state not being removed

* Update hovered row on wheel

* Update scroll styles and z-index

* Improve scroll logic and handle horizontal wheel events

* Simplify and improve z index styles

* Fix styles when using no sticky columns

* Improve rendering performance

* Improve performance by removing keyed each blocks and fix reorder target styling

* Ensure scroll top is always properly reset and add config store

* Allow configuring selecting rows and adding rows

* Integrate sheet into data section better

* Add back in functional delete row button

* Refactor stores and make state more modular

* Lint and remove unused deps

* Remove add column button

* Fix options cells being unable to scroll

* Add WIP initial multi-user websocket implementation for sheets

* Add WIP multi-user UI for sheet interface

* Fix issues with not disconnecting users when swapping datasource and improve multi-user UI

* Update layout and remove logging

* WIP column popovers for dataspace sheets

* Add popovers to sheet column headers, improve mouse UX

* Tidy reordering stuff

* Refactor resizing logic into store and improve UX around hover events when resizing/reordering

* Add column sorting and reordering via popover

* Handle context menu events in header cells

* Fully integrates sheets with datasection and remove lots of old stuff

* Fix buttons being highlighted when filters are set

* Add flags for controlling editing and adding rows in sheets

* Count context menu clicks when considering the click outside handler

* Prevent adding rows to users table and remove log

* Expose loading state of sheet and improve column highlighting logic

* Small style updates

* Update delete button and allow horizontal scrolling

* Add context menu to sheets with deletion and duplication features

* Improve UX around selecting rows and cells

* Add basic keyboard interactions to dataspaces

* Improve keyboard navigation in sheets

* Remove unnecessary searching through large rows array

* Fix issue with deleting rows and fix relationship cells displaying undefined

* Improve loading state

* Update menu width

* Merge with new shared-core and moved lucene utils

* Improve rendering performance and simplify component props

* Remove new row component and improve mouse interactions

* Tidy up buttons above sheets and add FAB for adding rows

* Optimise sheet data loading and add sort button

* Update sorting and remove logs

* Add sheet button to control column visibilty, improve sorting, improve disabled states

* Fix bug with select placeholders and fix sorting loops causing endless refreshes

* Update filter button to look consistent and add double click to resize columns to default width

* Ensure all derived stores have default values

* Reset scrolling when datasource changes and fix wasted pagination calls

* Improve performance by removing searches through the full row array

* Add advanced key handling for spreadsheets and improve blur and focus UX

* Ensure the selected cell is always visible

* Add icons for all data types

* Add new long form text cell

* Add boolean cell

* Add ability to focus first cell via tab

* Add cells for formulae and JSON

* Remove console logs

* Add attachment cell

* Increase padding to account for attachment dropdown

* Prevent deleting autocolumns via keyboard

* Fix attachments overflowing

* Improve sort button, remove header more icons unless hovered and highlight sorted column

* Add functional relationship cell

* Improve relationship cell

* Fix race conditions and edge cases in relationship cell

* Update user avatar colours

* Improve preservation of column widths in sheets when making schema changes

* Remove redundant sheet schema context and fix issues with mutating table schema

* Disable websocket in sheets

* Rollback state changes when row saving fails

* Fix one-to-many relationships allowing selecting multiple rows on both sides

* Remove log

* Make sheet gutter width customisable

* Allow expanding rows using existing edit row modal

* Fix text cell not using full width

* Sort columns to put autocolumns last

* Add new footer for adding rows, improve store memoization, support inverting all data types

* Improve animations for adding rows and handle add row failure

* Ensure all sheet feature flags work as expected and fix multi row deletion

* Fix options ordering

* Fix add row button not appearing when horizontal scrollbar is hidden

* Fix selecting newly created rows

* Remove log and add notification when creating or editing columns

* Move new row component to top, automatically invert cell renderers when required

* Add resizable rows

* Fix overlapping long form text borders

* Fix scroll not working in new row

* Update new row component, fix z-index issues, improve UX

* Large refactors to row creation, naming and sheet APIs

* Refactor stores to fix dependency issues, use modals for adding rows, simplify sheet

* Fix resize overlays

* Add custom colors for drop shadows and blue-100 to all themes, fix sticky column shadow

* Increase horizontal padding when scrolling to a selected cell

* Add multiple validation improvements

* Add validation to duplicating rows

* Remove log

* Restore missing event handler

* Improve data fetch reset logic, fix issues with stale cache in spreadsheets

* Fix issue with cell colors, improve row API interactions to avoid relationship issues due to API response differences

* Fix filters not working

* Simplify logic for reordering and add new overlay. Simplify sheet cells

* Fix importing and exporting with sheets

* Fix reorder overlay z-index issue

* Fix issue when no display column exists

* Fix issue with display column not being able to be unset

* Add persitence to column size and order in sheets

* Improve sheet integration with data section and add horizontal cell inversion

* Fix double click resizing of sticky column

* Make column visibility persistent and refactor column updating

* Improve sheet loading states

* Add beta button to sheet, tidy up constants

* Work around table API inconsistencies to handle table schema updates

* Add additional reorder options and improve beta button

* Improve sorting

* Add copy and paste to spreadsheet and add immediate editing of cells without additional click

* Remove copy/paste rows, remove move to start/end, improve copy/paste for cell values

* Fix dependency ordering

* Refactor other sheet stores to improve dependency ordering

* Fix errors not showing in sticky column and clear cell value on backspace press

* Rewrite relationship cell and update default column widths

* Ensure dynamic row height is properly accounted for

* Update text cells, number cells, long form field cells and relationship cells to respect row height

* Fix row heights with sticky column

* Update JSON, boolean and date cells to respect row height

* Update attachment cell to respect row height

* Use unique background for focused cell

* Standardise shadows across cell types

* Persist row height as table metadata

* Improve a few design issues

* Clean up

* Fix relationship cells not being readonly

* Lint

* Fix icon padding in relationship picker

* Improve styles in relationship dropdown

* Update shadow

* Update relationship icons

* Update relationship icons

* Update error label max size and position

* Prevent using invalid data types as display columns

* Add menu option to edit rows in modal

* Prevent sheet handling key events sourcing from modals

* Standardise menu overlay shadow and add count to relationship cells when hovering

* Improve relationship cell performance

* Remove spellcheck from text fields

* Fix resize overlay handler height

* Fix reorder overlay height

* Remove unused code and change selected table faster in data section

* Fix table selection not working when on datasource page

* Improve sheet loading state

* Add rowHeight property to table types

* Restore builder middleware

* Remove any naming of dataspaces

* Lint

* Disable row import button for users table and add optional chaining to spreadsheetsocket invocations to fix tests

* Use unique user edit modal for editing users in sheets

* Add schemaOverrides prop to sheet and use it to customise user table schema

* Update number icon

* Fix primary display column not properly disabling certain menu options

* Merge

* Update beta button position slightly

* Update beta button text

* Fix HMR for custom plugins which was broken due to signed minio links

* Add maze link to grid

* Update koa <> socket.io integation to improve fake koa context and allow current app middleware

* Rename sheet to grid

* Fix menu postiion, fix copy and paste in menu not working

* Remove commented out usages of websocket emissions for grid
2023-04-20 15:56:24 +01:00
Andrew Kingston 7afd716e91 Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-04-20 15:24:25 +01:00
mike12345567 67de033683 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-19 15:01:26 +01:00
adrinr f10d5c5beb Update yarn.lock 2023-04-19 10:26:20 +01:00
adrinr 98b372965c Merge branch 'develop' into chore/pro_as_submodule 2023-04-19 10:22:48 +01:00
Andrew Kingston 1aed6f89d5 Merge 2023-04-18 21:06:04 +01:00
Andrew Kingston 9b2b071b88 Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-04-18 21:00:42 +01:00
Budibase Staging Release Bot 1e4e61772b Update pro version to 2.5.6-alpha.5 2023-04-18 16:42:01 +00:00
Gerard Burns d36cd3b1f8 Builder Unit Test PoC (#10173)
* wip

* wip
2023-04-18 14:37:29 +01:00
adrinr b1ea582cac Update pro ref 2023-04-18 12:32:53 +01:00
adrinr 37158594f7 Merge branch 'develop' into chore/pro_as_submodule 2023-04-18 12:21:38 +01:00
Andrew Kingston 876522bf1e Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-04-18 10:48:53 +01:00
Budibase Staging Release Bot af233b8fb3 Update pro version to 2.5.6-alpha.3 2023-04-18 09:45:43 +00:00
adrinr 41b05442ef Update husky 2023-04-17 19:33:45 +01:00
mike12345567 9a36377d6e Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-17 18:10:29 +01:00
Andrew Kingston 208e481bbc Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-04-17 17:00:56 +01:00
adrinr 1dcb6b32b2 Remove not required references 2023-04-17 15:54:13 +01:00
mike12345567 b6f14a3f55 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-17 14:58:40 +01:00
mike12345567 453d5cc0e6 Further PR comments. 2023-04-17 14:03:54 +01:00
Budibase Staging Release Bot acab893fc0 Update pro version to 2.5.6-alpha.1 2023-04-17 11:34:41 +00:00
Budibase Staging Release Bot 3b0d854af0 Update pro version to 2.5.5-alpha.4 2023-04-17 10:52:36 +00:00
adrinr 33c3b67f8c Merge branch 'develop' into chore/remove_old_zlib_ref 2023-04-17 11:28:43 +01:00
Budibase Staging Release Bot c1d85bc8b0 Update pro version to 2.5.5-alpha.2 2023-04-17 09:35:44 +00:00
adrinr b91d518e54 Remove zlib npm references 2023-04-17 10:06:15 +01:00
Budibase Staging Release Bot 4755dd6120 Update pro version to 2.5.5-alpha.1 2023-04-17 09:03:01 +00:00
mike12345567 fc756a3944 Updating yarn lock. 2023-04-14 17:33:32 +01:00
mike12345567 af72b730e0 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-14 13:06:57 +01:00
Budibase Staging Release Bot f3e9790a6e Update pro version to 2.4.44-alpha.26 2023-04-14 11:36:19 +00:00
Budibase Staging Release Bot d9e2ea1272 Update pro version to 2.4.44-alpha.25 2023-04-14 11:19:39 +00:00
Budibase Staging Release Bot b81804b905 Update pro version to 2.4.44-alpha.23 2023-04-14 11:05:30 +00:00
Budibase Staging Release Bot 1116c63ed4 Update pro version to 2.4.44-alpha.22 2023-04-14 10:19:12 +00:00
adrinr 0aa5b3da03 Merge branch 'develop' into chore/yarn_workspaces 2023-04-13 19:29:45 +01:00
mike12345567 361005b521 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-13 17:23:58 +01:00
adrinr d9d8243d4c Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule 2023-04-13 15:35:29 +01:00
adrinr 3bf9a16b63 Update babel-jest 2023-04-13 12:59:21 +01:00
adrinr eebae26d7d Undo not needed tsconfig changes 2023-04-13 12:43:39 +01:00
adrinr 6c1459c3b0 Update yarn.lock 2023-04-13 12:15:08 +01:00
adrinr b30de4d174 Update yarn.lock 2023-04-13 11:00:53 +01:00
adrinr d6f73ae9de Add runner 2023-04-13 10:54:35 +01:00
adrinr caeb331c7a Add yarn link (needed for some test path refs) 2023-04-13 10:54:35 +01:00
adrinr 3672acd68e Fix backend-core tests 2023-04-13 10:54:35 +01:00
adrinr 07a82925ba Add missing dependency 2023-04-13 10:54:35 +01:00
adrinr d56129f3fc Remove types 2023-04-13 10:54:35 +01:00