Commit Graph

20579 Commits

Author SHA1 Message Date
Peter Clement 4be96846c9 Merge remote-tracking branch 'origin/master' into fix/creator-in-portal-bug 2023-09-12 17:28:45 +01:00
Peter Clement 2dd2dcc2cb Role fixes 2023-09-12 17:26:41 +01:00
Martin McKeaveney 0c19bac1ec Merge pull request #11743 from Budibase/budi-7476-postgres-sql-invalid-time-value-error-when-saving-json-as
Postgres sql invalid time value error when saving json as text
2023-09-12 11:18:23 +01:00
Mel O'Hagan 91fedc8241 Merge branch 'master' into budi-7476-postgres-sql-invalid-time-value-error-when-saving-json-as 2023-09-12 10:37:30 +01:00
Mel O'Hagan fab15e57d1 Merge branch 'master' into budi-7468-save-row-action-will-attempt-to-save-the-image-data-of-the 2023-09-12 10:29:39 +01:00
Mel O'Hagan fac2b845a0 Merge branch 'master' into budi-7468-save-row-action-will-attempt-to-save-the-image-data-of-the 2023-09-12 10:27:10 +01:00
Mel O'Hagan 260e0b6f99 Improve default S3 subtitle 2023-09-12 10:25:10 +01:00
Peter Clement d294b171c0 pro update 2023-09-12 09:40:29 +01:00
Mel O'Hagan 377fc7fc10 Updating pro reference to master 2023-09-12 09:38:33 +01:00
Peter Clement 0df9f821fe Merge remote-tracking branch 'origin/master' into fix/remove-developer-role-from-imports 2023-09-12 09:36:11 +01:00
Peter Clement cee89b95b1 remove reference to premium plan 2023-09-12 09:34:11 +01:00
Mel O'Hagan 17dc01808c Additional unit test 2023-09-11 21:35:51 +01:00
Mel O'Hagan 7147752b9c Fix date validation regex 2023-09-11 21:26:05 +01:00
Peter Clement 491d5b2de7 Remove missed reference to developer in user import modal 2023-09-11 16:01:47 +01:00
Martin McKeaveney 722c4e6d48 merge with master 2023-09-11 11:57:18 +01:00
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
Mel O'Hagan 139c642199 Don't send S3 image data url to rows endpoint 2023-09-08 23:53:15 +01:00
Andrew Kingston 32892b1ef9 Merge branch 'develop' into lab-theme-binding 2023-09-08 15:10:51 +01:00
Adria Navarro fd023cf291 Add dist/plugins.js back 2023-09-08 15:56:31 +02:00
Michael Drury 9e4be3f163 Merge branch 'develop' into fix/BUDI-7449 2023-09-08 13:08:44 +01:00
Adria Navarro f61abd1f1d Revert "Clean backend-core package" 2023-09-07 21:14:38 +01:00
Adria Navarro 4177008bc2 Merge branch 'develop' into chore/clean_npm_package 2023-09-07 20:38:31 +02:00
Martin McKeaveney b748149068 fix for app backups not being shown 2023-09-07 19:06:58 +01:00
Adria Navarro 847d8f0732 Update pro ref 2023-09-07 19:54:37 +02:00
Adria Navarro 3b69acc166 Merge branch 'develop' into update-node-types 2023-09-07 19:50:39 +02:00
Martin McKeaveney ab5753273d fix for legacy custom roles 2023-09-07 18:50:07 +01:00
Adria Navarro f6d1344ea5 Update pro ref 2023-09-07 19:49:55 +02:00
Michael Drury 7bb1db6c1d Merge branch 'develop' into fix/shared-core-dev 2023-09-07 17:07:41 +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
Mitch-Budibase 2502d87326 Merge branch 'develop' into account-portal-auth-api-testing-2 2023-09-07 16:51:24 +01:00
Mitch-Budibase 64ec4fe9e2 Merge branch 'develop' into account-portal-auth-api-testing-2 2023-09-07 16:39:37 +01:00
Michael Drury fe39bdfbfb Merge branch 'develop' into fix/shared-core-dev 2023-09-07 16:33:05 +01:00
Michael Drury 8b4c4fd3d7 Merge branch 'develop' into fix/BUDI-7447 2023-09-07 16:32:54 +01:00
mike12345567 2f115b5b64 Quick fix for automation timing. 2023-09-07 15:27:52 +01:00
Adria Navarro 7bd91ebb7f Fix 2023-09-07 16:25:13 +02:00
Adria Navarro 205d33f172 Clean cypress refs 2023-09-07 15:37:22 +02:00
Adria Navarro 8781ca0be7 Remove cypress dependencies 2023-09-07 15:27:13 +02:00
mike12345567 425c9cb112 Merge branch 'develop' of github.com:Budibase/budibase into fix/shared-core-dev 2023-09-07 14:03:32 +01:00
Mitch-Budibase 827f502611 Update pro reference 2023-09-07 11:06:56 +01:00
Mitch-Budibase 1aa2db275f Merge branch 'develop' into account-portal-auth-api-testing-2 2023-09-07 10:32:30 +01:00
mike12345567 ad1d25badf Updating pro to develop. 2023-09-07 10:32:00 +01:00
Adria Navarro f691987e65 Update node types 2023-09-07 11:21:41 +02:00
mike12345567 346060092a Updating pro to master reference. 2023-09-07 10:17:33 +01:00
Adria Navarro 2a3e83e53d Fix linting issues 2023-09-07 09:46:30 +01:00
Adria Navarro aca2d7be5b Remove src and test from the backend-core npm 2023-09-07 09:54:17 +02:00
Martin McKeaveney 4668315acd Merge branch 'develop' of github.com:Budibase/budibase into develop 2023-09-06 18:30:16 +01:00
Martin McKeaveney f6b15b0632 Merge branch 'branding-self-host' of github.com:Budibase/budibase into develop 2023-09-06 18:30:01 +01:00
mike12345567 c361588bd4 Updating the yarn dev process to not include a removal of the dist directory as part of the streamed watchers - this seems to create a problem for shared core and moving this up a level to a parallel run before the watchers massively improves stability. 2023-09-06 18:17:44 +01:00