Commit Graph

28421 Commits

Author SHA1 Message Date
Dean 08ca33563d Merge remote-tracking branch 'origin/v3-ui' into feature/builder-filtering-update 2024-09-16 09:05:24 +01:00
deanhannigan c9fd03668e
Merge branch 'master' into v3-ui 2024-09-16 09:04:51 +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
Dean 7e19e237b1 Merge remote-tracking branch 'origin/v3-ui' into feature/builder-filtering-update 2024-09-13 14:35:43 +01:00
Andrew Kingston 3af090d50f
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-09-13 14:29:37 +01:00
Andrew Kingston 663c0f20af
Don't use display names as role names, and restore usual names for built in roles 2024-09-13 14:14:36 +01:00
Dean 627e7fc799 Merge remote-tracking branch 'origin/v3-ui' into feature/builder-filtering-update 2024-09-13 12:06:54 +01:00
Andrew Kingston ab018ced1f
Merge branch 'v3-ui' of github.com:Budibase/budibase into v3-ui 2024-09-13 10:39:33 +01:00
Martin McKeaveney d8df76954d
Merge pull request #14572 from Budibase/fix-vulns
updating JS dependencies to get rid of vulns
2024-09-12 17:53:30 +01:00
Martin McKeaveney 01a1379335 pin airtable dependency 2024-09-12 17:43:13 +01:00
Martin McKeaveney 57cf542101 updating JS dependencies to get rid of vulns 2024-09-12 17:32:42 +01:00
Michael Drury fed2870a86
Merge branch 'master' into feature/role-metadata-and-view-control 2024-09-12 17:18:48 +01:00
melohagan 683745d3fd
Update account-portal ref (#14571)
* Update account-portal ref

* update account-portal ref

---------

Co-authored-by: Michael Drury <me@michaeldrury.co.uk>
2024-09-12 16:14:16 +00:00
Martin McKeaveney 58837a6eb6
Merge pull request #14368 from Budibase/Fix-user-access-roles-from-displaying-business
Fix user access roles from displaying business
2024-09-12 16:53:16 +01:00
mike12345567 b644dd47b9 build fix. 2024-09-12 16:27:18 +01:00
mike12345567 ef3f726346 Fixing test cases. 2024-09-12 16:23:00 +01:00
mike12345567 3a68b1ae30 Fixing test case - removing licensing. 2024-09-12 16:16:40 +01:00
mike12345567 8144aed935 Linting. 2024-09-12 15:53:44 +01:00
mike12345567 4d428f33f6 Adding validator for uiMetadata. 2024-09-12 15:45:41 +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
Pascal Reichmuth e4664d23d7
Update openai.ts 2024-09-12 16:22:49 +02:00
Dean 46cc9a074b Merge remote-tracking branch 'origin/v3-ui' into feature/builder-filtering-update 2024-09-12 15:02:07 +01:00
Dean 1454e52509 Merge remote-tracking branch 'origin/master' into v3-ui 2024-09-12 15:01:23 +01:00
Pascal Reichmuth 0798f97066
Update StepInputsOutputs.ts 2024-09-12 15:53:35 +02:00
Pascal Reichmuth d8ff33441e
Update openai.ts 2024-09-12 15:51:00 +02:00
Michael Drury 8c1d6a4eb0
Merge branch 'master' into fix/role-permission-update 2024-09-12 13:57:01 +01:00
Martin McKeaveney 62ff150364 update pro ref 2024-09-12 13:53:51 +01:00
Michael Drury cdcefc397c
Merge branch 'master' into fix/role-permission-update 2024-09-12 13:30:05 +01:00
Conor Webb 423f76950f
Merge branch 'master' into Fix-user-access-roles-from-displaying-business 2024-09-12 11:10:57 +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
Martin McKeaveney 47110e095f updating budibase apps image to use alpine 2024-09-11 17:42:08 +01:00
Peter Clement 11c18474b2
Merge branch 'master' into tests/automation-branching-tests 2024-09-11 16:05:37 +01:00
Peter Clement babbe16d7d fix test name 2024-09-11 15:50:21 +01:00
Peter Clement f377b9f566 remove top level table config 2024-09-11 15:39:21 +01:00
Michael Drury 9feebdbb13
Merge branch 'master' into fix/sql-use-ctes 2024-09-11 15:04:48 +01:00
melohagan 8b8595293b
Export publishEvent (#14560) 2024-09-11 14:02:42 +00:00
Peter Clement 56b727a245 uneeded boolean 2024-09-11 15:00:39 +01:00
Martin McKeaveney 2e83b9a34d add import 2024-09-11 14:53:51 +01:00
mike12345567 176c3d4ffd SQL test update. 2024-09-11 14:52:09 +01:00
Peter Clement 1947000f0c update case where no branch condition is met 2024-09-11 14:50:52 +01:00
Michael Drury 7ad14302fa
Merge branch 'master' into fix/sql-use-ctes 2024-09-11 14:47:22 +01:00
Martin McKeaveney f6da691364 update account portal ref 2024-09-11 14:37:28 +01:00
mike12345567 fc3a865cfb Test fix. 2024-09-11 14:26:01 +01:00
mike12345567 c9b64e3591 SQLite uses CTE with SQS 2.1.1. 2024-09-11 13:41:54 +01:00
mike12345567 05de673781 Merge branch 'master' of github.com:Budibase/budibase into aggregate-all-sql-dbs 2024-09-11 13:25:25 +01:00
Dean 956a10e1b4 Lint 2024-09-11 13:05:14 +01:00
Dean ae8bd22253 Merge remote-tracking branch 'origin/v3-ui' into feature/builder-filtering-update 2024-09-11 12:46:47 +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