Commit Graph

25867 Commits

Author SHA1 Message Date
Michael Drury a669712d0c
Merge branch 'master' into remove-apidoc-comments 2023-10-27 13:36:07 +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
Sam Rose 5dd61f8994
Remove APIDoc comments. 2023-10-27 11:47:01 +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
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
Dean 4b1e7359b0 Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator 2023-10-27 10:00:02 +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
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
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
Adria Navarro 2b59ae4c9b
Merge pull request #12181 from Budibase/chore/single-release-pipeline
Tweaks for single release pipeline
2023-10-26 15:17:31 +02: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
Adria Navarro 589727ea06
Merge branch 'master' into chore/single-release-pipeline 2023-10-26 12:33:43 +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
Adria Navarro 980e223aef Fix typo 2023-10-26 11:24:20 +02: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
Adria Navarro 04e0751bfe
Merge branch 'master' into chore/single-release-pipeline 2023-10-26 11:06:45 +02:00
Adria Navarro 389848efbe Add update versions v2 2023-10-26 11:05:07 +02: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 dcc16cd4a2
Merge pull request #12094 from Budibase/refactor-grid-columns
Refactor grid column handling
2023-10-26 09:41:06 +01:00
Andrew Kingston a74f78f31b
Merge branch 'master' into feature/buttongroup-component 2023-10-26 09:14:40 +01:00
Adria Navarro 7ddaf6479f Clean unused pipelines 2023-10-26 09:54:38 +02:00
Andrew Kingston 0d9e9caff6
Merge branch 'master' into refactor-grid-columns 2023-10-26 08:53:17 +01:00
Budibase Staging Release Bot dccc60c9b0 Bump version to 2.11.45 2023-10-26 07:05:00 +00:00
Andrew Thompson 0f8a34d982
Merge pull request #12180 from Budibase/cloudfront-csp-fix
add cloudfront to script csp to fix cloud plugins
2023-10-26 07:46:21 +01:00
andz-bb 4bcc49b692 add cloudfront to script csp to fix cloud plugins 2023-10-26 07:33:53 +01:00
Andrew Kingston 87c1726eec
Merge pull request #12112 from Budibase/enable-collapsing-settings-sections
Allow settings sections to be collapsed
2023-10-25 14:48:35 +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 91d6130f7b
Merge pull request #12049 from Budibase/grid-inline-searching
Inline searching for grid and grid block
2023-10-25 13:56:36 +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
deanhannigan 26cecf2543
Merge pull request #12124 from Budibase/feature/component-name-setting-ux-update
Edit component name from the settings panel title
2023-10-25 12:49:05 +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