Commit Graph

25973 Commits

Author SHA1 Message Date
Michael Drury 7997bc50eb
Merge pull request #12201 from Budibase/fix/12199-group-custom-role-issue
Group custom role login issue
2023-10-27 17:18:35 +01:00
mike12345567 6ecf831f02 Updating pro submodule reference. 2023-10-27 17:10:03 +01:00
Sam Rose 5539ff9c9c
Apply valid file types to RowFieldControl and AttackmentField. 2023-10-27 16:53:32 +01:00
Sam Rose 6bb6f106d5
Apply valid file types to AttachmentCell. 2023-10-27 16:46:30 +01:00
Sam Rose 2160f4e5e2
Add valid extension list to shared-core. 2023-10-27 16:24:02 +01:00
Adria Navarro e5aa29bd79 Fix CI 2023-10-27 17:17:38 +02:00
Adria Navarro 3ed2aa1d77 Revert major update 2023-10-27 16:59:49 +02:00
Adria Navarro 43f9dc481d Update ref 2023-10-27 16:55:50 +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 7b7dc84a8e Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-27 16:05:43 +02: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
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 a669712d0c
Merge branch 'master' into remove-apidoc-comments 2023-10-27 13:36:07 +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
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
Sam Rose 5dd61f8994
Remove APIDoc comments. 2023-10-27 11:47:01 +01:00
Adria Navarro bd70b29d66 Update ref 2023-10-27 12:40:07 +02:00
Adria Navarro 7b5b274f8f Eslint ignore warnings 2023-10-27 12:32:38 +02:00
Adria Navarro c79f37ee9c Update eslint packages 2023-10-27 12:14:21 +02: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
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
mike12345567 8b9a8bf5f2 Updating pro reference. 2023-10-27 10:46:00 +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
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 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
deanhannigan 55a54086c4
Merge pull request #12057 from Budibase/feature/buttongroup-component
New Button group component
2023-10-27 09:12:32 +01:00
Dean e7fcd08fc6 Merge remote-tracking branch 'origin/master' into feature/buttongroup-component 2023-10-27 09:03:46 +01:00
Dean 122c8ec18c Merge remote-tracking branch 'origin/master' into fix/row-id-delete-parsing 2023-10-27 09:02:23 +01:00
Andrew Kingston d512bc2d11
Merge pull request #12113 from Budibase/feature/formblock-styles-tab-reflow
Formblock styles/settings tab reflow
2023-10-27 08:40:22 +01:00
Andrew Kingston c61e4fe708
Merge branch 'master' into feature/formblock-styles-tab-reflow 2023-10-27 08:12:31 +01:00
Sam Rose b3cc9bea23
Merge branch 'master' of github.com:Budibase/budibase into bug/budi-7681-groups-list-infinite-reload-loop 2023-10-26 17:55:58 +01:00
Sam Rose 5a80487c77
Fix redirect loop when accessing a group as a global builder but not an admin. 2023-10-26 17:54:26 +01:00
melohagan 9616e8e551
Custom role navigation links (#12056)
* Refactor routing unit tests

* Filter out higher level roles in preview

* unit test

* Refactor

---------

Co-authored-by: Michael Drury <me@michaeldrury.co.uk>
2023-10-26 15:28:12 +00:00
Dean 6d9ca77d99 Merge remote-tracking branch 'origin/master' into fix/row-id-delete-parsing 2023-10-26 16:24:37 +01:00
Dean 5266d80afe Fix to ensure single integer ids are parsed correctly 2023-10-26 16:09:01 +01:00