Commit Graph

27244 Commits

Author SHA1 Message Date
Adria Navarro 7b7dc84a8e Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-27 16:05:43 +02:00
Sam Rose d04f2198b6
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-27 15:04:18 +01:00
Adria Navarro 54e7807cd1 Update ref 2023-10-27 15:57:50 +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
Peter Clement 38fe8375ce fix bindings references being updated 2023-10-27 13:47:34 +01:00
Michael Drury 454e9cf5c8
Merge pull request #12198 from Budibase/remove-apidoc-comments
Remove APIDoc comments.
2023-10-27 13:46:21 +01:00
Michael Drury c0a9b0a678
Merge branch 'master' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-27 13:36:52 +01:00
Michael Drury a669712d0c
Merge branch 'master' into remove-apidoc-comments 2023-10-27 13:36:07 +01:00
Michael Drury 2bfdd9769e
Merge pull request #12177 from Budibase/feature/make-table-source-id-required
Make sourceId property of table required (for all table types)
2023-10-27 13:35:47 +01:00
Adria Navarro 68a476de30 Unify jest 2023-10-27 13:58:59 +02:00
Adria Navarro 1318bdad0f Update ref 2023-10-27 13:54:54 +02:00
Adria Navarro 4b7cfa9e5a Dedup 2023-10-27 13:51:44 +02:00
Dean 09c3ad50c9 Merge remote-tracking branch 'origin/master' into feature/form-block-settings-reflow 2023-10-27 12:44:14 +01:00
deanhannigan a8308db09a
Merge pull request #12157 from Budibase/feature/change-global-admin-to-creator
Show 'Creator' instead of 'Admin' for the global user role picker
2023-10-27 12:41:48 +01:00
Andrew Kingston 8612404f48 Merge branch 'master' of github.com:Budibase/budibase into form-block-field-layout 2023-10-27 11:49:39 +01:00
Sam Rose 5dd61f8994
Remove APIDoc comments. 2023-10-27 11:47:01 +01:00
mike12345567 9b1a7bd854 PR comments - updating pickAPI to use a common function. 2023-10-27 11:43:01 +01:00
Andrew Kingston b1f2337849 Hide field layout settings for normal field components, and only show them when editing from within a form block 2023-10-27 11:42:01 +01:00
Adria Navarro bd70b29d66 Update ref 2023-10-27 12:40:07 +02:00
Dean d9f52295ee Moved the description block out of the header to ensure it's visible for the view mode 2023-10-27 11:36:45 +01:00
Adria Navarro 7b5b274f8f Eslint ignore warnings 2023-10-27 12:32:38 +02:00
Peter Clement b1dabe7dc5 missing binding 2023-10-27 11:22:34 +01:00
Peter Clement bce098f04e Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates 2023-10-27 11:16:09 +01:00
Adria Navarro c79f37ee9c Update eslint packages 2023-10-27 12:14:21 +02:00
Conor Webb 2b691c169f Ran Prettier to fix linting issue. 2023-10-27 11:13:24 +01:00
Dean d790fb28da Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator 2023-10-27 11:05:59 +01:00
Sam Rose a4f345de39
Merge pull request #12187 from Budibase/bug/budi-7681-groups-list-infinite-reload-loop
Fix redirect loop when accessing a group as a global builder but not an admin.
2023-10-27 10:57:46 +01:00
Conor Webb d0ea6edad3 Added selected class to data provider options. 2023-10-27 10:55:19 +01:00
mike12345567 fd4db2c1b2 Merge branch 'master' of github.com:Budibase/budibase into bug/budi-7681-groups-list-infinite-reload-loop 2023-10-27 10:48:06 +01:00
mike12345567 ae69f9dd92 Update pro reference. 2023-10-27 10:47:50 +01:00
mike12345567 09052cb1a6 Revert "Updating pro reference."
This reverts commit 8b9a8bf5f2.
2023-10-27 10:47:09 +01:00
Peter Clement bade344834 Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates 2023-10-27 10:46:26 +01:00
mike12345567 8b9a8bf5f2 Updating pro reference. 2023-10-27 10:46:00 +01:00
Peter Clement 8a7a2abd61 styling / pr comments 2023-10-27 10:45:58 +01:00
Sam Rose 731ff06be4
Merge pull request #12185 from Budibase/feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-6
Replace several instances of `any` with `DatabaseQueryOpts`.
2023-10-27 10:24:55 +01:00
Michael Drury fec5015422
Merge branch 'master' into bug/budi-7681-groups-list-infinite-reload-loop 2023-10-27 10:14:39 +01:00
Duarte Velez Grilo fbbc5d0f64
Merge branch 'master' into master 2023-10-27 10:08:24 +01:00
Adria Navarro c072c2da47 Update vite packages 2023-10-27 11:07:58 +02:00
Dean 4b1e7359b0 Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator 2023-10-27 10:00:02 +01:00
Adria Navarro 4d01663247 Add clean top level node_modules on `yarn clean` 2023-10-27 10:58:06 +02:00
Adria Navarro 6abb1b5f70 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-27 10:57:07 +02:00
Dean 4fc7143b32 Merge remote-tracking branch 'origin/master' into feature/form-block-settings-reflow 2023-10-27 09:41:08 +01:00
Dean c4cede035c Merge remote-tracking branch 'origin/master' into fix/row-id-delete-parsing 2023-10-27 09:26:30 +01:00
Andrew Kingston 8e3974d912
Merge pull request #12135 from Budibase/fix/view1-sortable-column-config
Parse view v1 schema to fix builder crash.
2023-10-27 09:25:29 +01:00
Andrew Kingston 1d5fc3a175
Merge branch 'master' into fix/view1-sortable-column-config 2023-10-27 09:19:06 +01:00
Dean 58437cff06 Merge remote-tracking branch 'origin/master' into fix/row-id-delete-parsing 2023-10-27 09:14:07 +01:00
Peter Clement 89a242f354 fix issue with readable bindings not displayinng correctly 2023-10-27 09:13:27 +01:00
deanhannigan 55a54086c4
Merge pull request #12057 from Budibase/feature/buttongroup-component
New Button group component
2023-10-27 09:12:32 +01:00