Commit Graph

21611 Commits

Author SHA1 Message Date
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
Dean c4cede035c Merge remote-tracking branch 'origin/master' into fix/row-id-delete-parsing 2023-10-27 09:26:30 +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
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 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
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
Michael Drury 9983d67163 Adding mimetype for client library response (correcting from octet-stream). 2023-10-24 22:13:56 +01:00
Michael Drury 5fabe32434 Making sure client endpoint available in prod. 2023-10-24 20:35:25 +01:00
Michael Drury c6b377c565
Revert "Revert "Client library fetching through server"" 2023-10-24 18:13:36 +01:00
Michael Drury e2e5c9044c
Revert "Client library fetching through server" 2023-10-24 18:12:20 +01:00
Michael Drury 2888335724
Merge branch 'master' into fix/client-lib-fetching 2023-10-24 17:31:44 +01:00
mike12345567 701d30abb4 Don't pass through default tenant ID. 2023-10-24 17:30:57 +01:00
mike12345567 ba5b1d7cfa Adding tenant ID to query string and fixing test cases. 2023-10-24 17:27:58 +01:00
mike12345567 b53158ac08 Moving the client library to be retrieved using the same mechanism as we do in development, through the server instance (same as the builder itself). This should help with the CDN issues that we have been having, although attachments are still currently affected. 2023-10-24 16:25:14 +01:00
jvcalderon 102a082484 Update pro submodule 2023-10-24 17:18:13 +02:00
jvcalderon cea1c04b73 Creators count functionality 2023-10-24 17:16:44 +02:00
Andrew Kingston ea7b3381c2 Merge branch 'master' of github.com:Budibase/budibase into grid-inline-searching 2023-10-24 13:37:44 +01:00
Adria Navarro 969ab79a61
Merge branch 'master' into feature/buttongroup-component 2023-10-24 14:30:09 +02:00
Andrew Kingston 7e3d59a582
Merge branch 'master' into grid-inline-searching 2023-10-24 13:30:07 +01:00
Andrew Kingston 7c19e9ed96
Merge branch 'master' into fix-table-metadata 2023-10-24 11:34:52 +01:00
jvcalderon 5c1710b5da Update pro submodule 2023-10-24 12:15:28 +02:00
jvcalderon dbc903f3e6 Remove console.log 2023-10-24 12:03:07 +02:00
jvcalderon 980a46abb3 Merge branch 'master' into feature/per-creator-migration 2023-10-24 11:03:02 +02:00
jvcalderon f643bc5ee8 Keep only migrations 2023-10-24 10:24:00 +02:00
Andrew Kingston d82aec9f31
Merge branch 'master' into feature/form-block-description 2023-10-24 08:56:14 +01:00
Andrew Kingston 76edd1421a
Merge branch 'master' into feature/formblock-styles-tab-reflow 2023-10-24 08:55:51 +01:00
Andrew Kingston 654e6539bb
Merge branch 'master' into fix-table-metadata 2023-10-24 08:55:23 +01:00
Andrew Kingston b6a8e6c0cf
Merge branch 'master' into enable-collapsing-settings-sections 2023-10-24 08:54:54 +01:00
Adria Navarro 52b86b44cb
Merge branch 'master' into feature/change-global-admin-to-creator 2023-10-24 09:54:19 +02:00
Andrew Kingston c5537dd58c Prettier 2023-10-24 08:46:55 +01:00
Andrew Kingston f355933bf3 Add grid support for old views with groupBy specified, and any other datasource that has a custom means of determining a datasource schema 2023-10-24 08:26:57 +01:00
Dean 08a22f1525 Show 'Creator' instead of 'Admin' for the global user role picker 2023-10-23 16:47:05 +01:00
Adria Navarro 3deb8341d3
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-23 15:57:24 +02:00
jvcalderon bc4dd8e1c9 Update pro submodule 2023-10-23 15:43:44 +02:00
Adria Navarro 453c0744be Fix tests 2023-10-23 15:20:44 +02:00
Adria Navarro e3b342da57 Fix after renames 2023-10-23 13:57:23 +02:00
Adria Navarro 3c85f1ce9e Fix after renames 2023-10-23 13:55:58 +02:00
Adria Navarro 3c16e82035 Comment docker 2023-10-23 13:55:23 +02:00
Adria Navarro 0cc7cc67a3 Renames 2023-10-23 13:53:18 +02:00
Andrew Kingston 73f3b76c01 Update default column visibility check 2023-10-23 12:40:29 +01:00
Dean cf8a634a72 Merge remote-tracking branch 'origin/master' into feature/form-block-description 2023-10-23 12:34:31 +01:00
jvcalderon a22aea63a3 Update pro submodule 2023-10-23 13:33:56 +02:00
jvcalderon a285fb1d40 Missed code in merge 2023-10-23 13:33:27 +02:00
jvcalderon 648410348d [Revert] [Added] Per user per creator changes 2023-10-23 13:27:59 +02:00
Adria Navarro 4ee1fd0f7a Default to package.json 2023-10-23 12:23:44 +02:00
Adria Navarro e7459bb5e7 Fix test 2023-10-20 20:42:58 +02:00
Adria Navarro 71869badfa Fix tests 2023-10-20 19:19:35 +02:00
Adria Navarro d1f0e8fca0 Fix tests 2023-10-20 17:53:40 +02:00
Adria Navarro e83e45e2b6
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-20 17:40:17 +02:00
Adria Navarro 5ee1d73e81 Add args to build 2023-10-20 17:25:30 +02:00
Adria Navarro 9dacb5849b Add versions to server/worker docker v2 2023-10-20 17:19:44 +02:00
Adria Navarro 13a8b20ea9
Merge branch 'master' into update-pro-ref 2023-10-20 17:04:04 +02:00
Adria Navarro 8a939dd3e6 Update pro submodule ref 2023-10-20 17:02:24 +02:00
mike12345567 8c744ea7a9 PR comments. 2023-10-20 15:57:45 +01:00
mike12345567 04a2bbc61a Two fixes here - a quick fix for the builder side panel, making sure it fills up with users correctly (not all, but enough to make it look more pleasant) as well as dropping user search endpoint permissions to allow basic users to access it for user columns. 2023-10-20 15:45:35 +01:00
Dean 871891c2a2 Parse view v1 schema to fix builder crashed caused by 'groupedby' views 2023-10-20 15:35:16 +01:00
Adria Navarro 56ae857d49 Add version to dev .env 2023-10-20 16:21:48 +02:00
Adria Navarro 961913b88a Use version from environment 2023-10-20 16:21:35 +02:00
Andrew Kingston 9a72c418c9 Remove duplicate comment 2023-10-20 14:13:30 +01:00
Michael Drury 8e76618a85
Merge branch 'master' into fix/12121-datasource-error-stopping-creation 2023-10-20 12:45:18 +01:00
Andrew Kingston 3bfa6e9d60
Merge branch 'master' into grid-inline-searching 2023-10-20 12:32:07 +01:00
mike12345567 bc8e84b815 Fixing datasource error states causing a datasource to fail to be built fully - this was simply a frontend issue of the error not being handled on creation. 2023-10-20 12:19:04 +01:00
Andrew Kingston 940801d8ea
Merge branch 'master' into grid-all-datasources 2023-10-20 11:54:42 +01:00
Dean 49389c2f35 Merge remote-tracking branch 'origin/master' into feature/component-name-setting-ux-update 2023-10-20 11:31:51 +01:00
Andrew Kingston db286d431a Fix dependsOn logic for gridblock after renaming setting key 2023-10-20 11:20:14 +01:00
Andrew Kingston fa90629139 Improve grid datasource backwards compatibility 2023-10-20 11:14:24 +01:00
Dean 22a8f7bfae Lint, removed dependancy import 2023-10-20 11:09:00 +01:00
Andrew Kingston 7fd7943a5a Remove required prop from gridblock to ensure backwards compatiblity 2023-10-20 11:07:37 +01:00