Commit Graph

26054 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Dean 4b1e7359b0 Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator 2023-10-27 10:00:02 +01: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
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
mike12345567 854ff47e1c Final fix - removing external from create table (internal). 2023-10-26 18:36:07 +01:00
mike12345567 e12cef305a Fixing export. 2023-10-26 18:34:21 +01:00
mike12345567 d13cc80022 Removing update to gitignore. 2023-10-26 18:23:39 +01:00
mike12345567 983091e901 Fix for tests - row.spec.ts needs to pick correct table create. 2023-10-26 18:21:06 +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
mike12345567 d0f989597a Updating tests to be more consistent in how they pick to create an internal or external table. 2023-10-26 17:27:54 +01:00
mike12345567 fd29b8d949 PR comments. 2023-10-26 17:27:40 +01:00
mike12345567 115a67cfd6 Fixing test case. 2023-10-26 17:03:05 +01:00
mike12345567 19eaafd946 Fixing some test cases. 2023-10-26 16:32:34 +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
Sam Rose ae356b6a50
Bump version of @budibase/nano to complete the DatabaseQueryOpts type usage. 2023-10-26 15:51:28 +01:00
Sam Rose 536d85d828
WIP: Improving the use of DatabaseQueryOpts. 2023-10-26 15:04:33 +01: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
mike12345567 ed0670a008 Major update to make the table.type always 'table' and then adding a new sourceType which states what source the table came from, external or internal. Don't want to keep using a type that should be static as two different things. 2023-10-26 13:19:09 +01: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