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
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
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
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
Dean
d790fb28da
Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator
2023-10-27 11:05:59 +01:00
mike12345567
ae69f9dd92
Update pro reference.
2023-10-27 10:47:50 +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
6abb1b5f70
Merge branch 'master' into BUDI-7580/account_portal_submodule
2023-10-27 10:57:07 +02:00
Andrew Kingston
1d5fc3a175
Merge branch 'master' into fix/view1-sortable-column-config
2023-10-27 09:19:06 +01:00
Dean
e7fcd08fc6
Merge remote-tracking branch 'origin/master' into feature/buttongroup-component
2023-10-27 09:03:46 +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
Adria Navarro
62cab7e25e
Merge branch 'master' into chore/single-release-pipeline
2023-10-26 14:44:16 +02:00
Gerard Burns
44f9c64ed7
Prevent the key user being used in rest queries ( #12072 )
...
* Add warning about unusable user binding
* linting
* remove unnecessary safe nav operators
* change regex to capture property access of user binding
2023-10-26 13:06:25 +01:00
Adria Navarro
3b3586d2bd
Merge branch 'master' into feature/change-global-admin-to-creator
2023-10-26 12:58:35 +02:00
Adria Navarro
8db0ff79a6
Increase yarn timeouts
2023-10-26 12:44:52 +02:00
Gerard Burns
5909b4a7c7
Add template for grid blocks ( #12086 )
...
* wip
* linting
---------
Co-authored-by: Mihail Hadzhiev <102024164+MihailHadzhiev2022@users.noreply.github.com>
2023-10-26 11:24:43 +01:00
Mihail Hadzhiev
3473aa61ff
Merge branch 'master' into feature/change-global-admin-to-creator
2023-10-26 12:58:52 +03:00
Mihail Hadzhiev
e5ff023881
Merge branch 'master' into feature/buttongroup-component
2023-10-26 12:50:47 +03:00
Dean
6032216e2f
Added fix for scenario where componentdefinition was queried befor it existed. Fix to ensure an empty general settings block is not shown
2023-10-26 10:13:22 +01:00
Dean
3b7ed3a7f2
Merge remote-tracking branch 'origin/master' into feature/formblock-styles-tab-reflow
2023-10-26 09:56:17 +01:00
Andrew Kingston
a74f78f31b
Merge branch 'master' into feature/buttongroup-component
2023-10-26 09:14:40 +01:00
Andrew Kingston
0d9e9caff6
Merge branch 'master' into refactor-grid-columns
2023-10-26 08:53:17 +01:00
Andrew Kingston
a3226bc905
Merge branch 'master' into enable-collapsing-settings-sections
2023-10-25 14:43:05 +01:00
Dean
8db0b300fd
Merge remote-tracking branch 'origin/master' into feature/buttongroup-component
2023-10-25 14:26:58 +01:00
Andrew Kingston
62f4c3e85b
Merge branch 'master' into refactor-grid-columns
2023-10-25 13:57:22 +01:00
Andrew Kingston
2bb8ba45d1
Merge branch 'master' into grid-inline-searching
2023-10-25 13:50:55 +01:00
Dean
536a27541f
Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator
2023-10-25 13:27:54 +01:00
Dean
d4ff67b999
Merge remote-tracking branch 'origin/master' into feature/component-name-setting-ux-update
2023-10-25 12:34:13 +01:00
Andrew Kingston
d3fe9775f3
Merge branch 'master' into grid-inline-searching
2023-10-25 12:32:04 +01:00
Dean
9200366f79
Merge remote-tracking branch 'origin/master' into fix/view1-sortable-column-config
2023-10-25 12:09:59 +01:00
Dean
b952892c42
Generalised the fix as not all calculations will have a groupby per PR feedback
2023-10-25 12:08:56 +01:00
Dean
66fda3db09
Merge remote-tracking branch 'origin/master' into fix/view1-sortable-column-config
2023-10-25 09:15:37 +01:00
José Vte. Calderón
bc1999fe30
Merge branch 'master' into feature/sync-quotas-2
2023-10-25 10:02:09 +02:00
Andrew Kingston
4fb18baf17
Merge branch 'grid-inline-searching' of github.com:Budibase/budibase into refactor-grid-columns
2023-10-25 08:48:21 +01:00
Andrew Kingston
b88be9b1df
Merge branch 'master' into feature/form-block-description
2023-10-25 08:45:34 +01:00
jvcalderon
65111c81ef
Reactivate sync quotas migration
2023-10-25 08:44:59 +02:00