Commit Graph

2380 Commits

Author SHA1 Message Date
Andrew Kingston e4900e27bb
Merge branch 'v3-ui' of github.com:Budibase/budibase into new-rbac-ui 2024-10-03 15:50:22 +01:00
Michael Drury 97b799f9db
Merge pull request #14694 from Budibase/view-merge-v3-ui
View changes - merge to V3 UI branch
2024-10-03 15:09:33 +01:00
Andrew Kingston f7318b15d4
Merge branch 'v3-ui' of github.com:Budibase/budibase into new-rbac-ui 2024-10-03 11:23:02 +01:00
Andrew Kingston edbb0b59f7
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-03 11:22:05 +01:00
Adria Navarro 1b53bab92e Extract 2024-10-03 10:28:29 +02:00
mike12345567 bcb940b7eb Merge issue. 2024-10-02 18:45:47 +01:00
mike12345567 786bfdb0e2 Merging v3-backport branch 2024-10-02 18:09:53 +01:00
mike12345567 5709c5f8d5 Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-02 17:51:22 +01:00
Andrew Kingston 66f6e91245
Merge branch 'v3-ui' of github.com:Budibase/budibase into new-rbac-ui 2024-10-02 16:08:54 +01:00
Andrew Kingston 3e3fd20207
Add tests for new default value types 2024-10-02 15:35:17 +01:00
Dean e2247cfb2c Merge remote-tracking branch 'origin/master' into v3-ui 2024-10-01 09:27:00 +01:00
Sam Rose f6649b294b
Remove an implicit any from removeInvalidFilters. 2024-09-30 15:54:01 +01:00
Andrew Kingston 2e5f07d3c8
Merge branch 'feature/role-multi-inheritance' of github.com:Budibase/budibase into new-rbac-ui 2024-09-30 08:22:07 +01:00
mike12345567 10e187014a Fixing type issues. 2024-09-26 18:02:32 +01:00
Sam Rose 7c6c03c80b
Rename ViewUIFieldMetadata -> ViewFieldMetadata to match master. 2024-09-26 15:32:21 +01:00
Sam Rose 43265bf1ea
Rejig view calculation code to work with aggregates again. Broke some other tests in the process. 2024-09-26 10:54:04 +01:00
Sam Rose f475454bce
Fix search API break. 2024-09-24 18:07:31 +01:00
mike12345567 36587691d2 Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-09-24 16:33:45 +01:00
Andrew Kingston 2773efad56
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-09-24 15:15:28 +01:00
Sam Rose 0fee7dfd4f
Merge branch 'master' of github.com:budibase/budibase into view-calculation-sql 2024-09-24 15:07:08 +01:00
Sam Rose 51774b3434
Working on plumbing 'source' all the way through our code. 2024-09-24 12:30:45 +01:00
mike12345567 464f973f12 Adding a separation for MariaDB and MySQL, mariaDB is the core of the problem, this solves for it by separating them and allowing us to use the special json_arrayagg for mariaDB, but use a correlated sub-query for MySQL. 2024-09-24 12:01:47 +01:00
Sam Rose 6cf7c55fd9
Merge master. 2024-09-23 14:14:23 +01:00
Sam Rose 9588192a52
Merge master. 2024-09-20 11:46:58 +01:00
mike12345567 38e54e91f7 Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-09-20 10:32:47 +01:00
Martin McKeaveney dadce14a71
Merge branch 'master' into budi-8608-ai-platform-level-config-pt-2 2024-09-19 10:48:01 +01:00
Martin McKeaveney cb8d0984b1 update Providers 2024-09-18 10:52:52 +01:00
Dean d792adbaba Merge remote-tracking branch 'origin/v3-ui' into feature/builder-filtering-update 2024-09-17 12:42:59 +01:00
deanhannigan e3abaab419
Merge branch 'master' into feat/automation-step-naming-updates 2024-09-17 09:15:17 +01:00
mike12345567 2fd73d044f Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-09-16 15:31:00 +01:00
Dean 08ca33563d Merge remote-tracking branch 'origin/v3-ui' into feature/builder-filtering-update 2024-09-16 09:05:24 +01:00
mike12345567 2a69cb220f Fixing an issue where table doesn't exist anymore for row trigger, which can cause the service to crash. 2024-09-13 18:54:47 +01:00
Peter Clement 7e767e4089 some pr comments 2024-09-13 12:25:39 +01:00
Dean 627e7fc799 Merge remote-tracking branch 'origin/v3-ui' into feature/builder-filtering-update 2024-09-13 12:06:54 +01:00
Peter Clement c980742081 Merge remote-tracking branch 'origin/master' into feat/automation-step-naming-updates 2024-09-13 12:04:48 +01:00
Michael Drury fed2870a86
Merge branch 'master' into feature/role-metadata-and-view-control 2024-09-12 17:18:48 +01:00
mike12345567 ef3f726346 Fixing test cases. 2024-09-12 16:23:00 +01:00
mike12345567 8144aed935 Linting. 2024-09-12 15:53:44 +01:00
mike12345567 4952747ae9 Taking working from new-rbac-ui branch and separating it into its own PR, so that other work can be based on this from master. 2024-09-12 15:40:37 +01:00
Pascal Reichmuth 2700dfc63d
Update StepInputsOutputs.ts 2024-09-12 16:23:05 +02:00
Dean 46cc9a074b Merge remote-tracking branch 'origin/v3-ui' into feature/builder-filtering-update 2024-09-12 15:02:07 +01:00
Peter Clement 5c304b0b69
Merge branch 'master' into feat/automation-step-naming-updates 2024-09-12 15:01:39 +01:00
Peter Clement a831a4bf07 tests to cover automation naming 2024-09-12 14:58:53 +01:00
Pascal Reichmuth 0798f97066
Update StepInputsOutputs.ts 2024-09-12 15:53:35 +02:00
Michael Drury cdcefc397c
Merge branch 'master' into fix/role-permission-update 2024-09-12 13:30:05 +01:00
melohagan 49a4e252c6
Allow an account holder to login to account-portal if the tenant has been deleted. (#14547)
* Add email to session for populate user

* Add email param

* use param object

* Type fix for tests

* Fix test

* Temporarily remove account-portal tests
2024-09-12 08:38:11 +00:00
mike12345567 e89042b2e3 Fixing some role typing issues, as well as fixing an issue with the validator not allowing the structure that roles are expected to have. 2024-09-11 18:06:05 +01:00
Peter Clement 1947000f0c update case where no branch condition is met 2024-09-11 14:50:52 +01:00
mike12345567 c0b38b74e0 Merge branch 'master' of github.com:Budibase/budibase into feature/builder-filtering-update 2024-09-11 12:23:06 +01:00
Martin McKeaveney 9179569cd7
Merge branch 'master' into budi-8608-ai-platform-level-config 2024-09-11 10:43:41 +01:00