Commit Graph

8951 Commits

Author SHA1 Message Date
mike12345567 0d1941f264 Fix merge conflict. 2023-06-30 11:36:08 +01:00
mike12345567 6495b55b9d Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-29 17:06:14 +01:00
mike12345567 63d16f1809 Only enable trust server certificate if encryption enabled. 2023-06-29 16:09:25 +01:00
mike12345567 7b6246ee59 Fixes discovered by MS-SQL validator tests in QA-core, fixing custom ports being used (not default) and allowing the use of self signed certificates. Also updating an error message in line with Peters changes. 2023-06-29 16:09:25 +01:00
mike12345567 a66d5bf7be Merge branch 'develop' of github.com:Budibase/budibase into feat/surface-sql-errors 2023-06-28 17:58:56 +01:00
Michael Drury 72e7373073 Merge pull request #11058 from Budibase/feature/budi-7076
Datasource settings tab for SQL databases and SQL schema export functionality
2023-06-28 17:56:03 +01:00
mike12345567 30a9b349d8 Merge branch 'develop' of github.com:Budibase/budibase into feat/surface-sql-errors 2023-06-28 17:31:03 +01:00
mike12345567 81c8bee81e Quick fix to stop custom role names from being updated. 2023-06-28 17:17:24 +01:00
mike12345567 d8fae3a348 Adding SQL export functionality and settings tab for SQL databases. 2023-06-28 16:52:45 +01:00
Adria Navarro ec3f962d3c Fix typings 2023-06-28 15:16:47 +01:00
Adria Navarro b6f9ae762d Lint 2023-06-28 14:59:49 +01:00
Adria Navarro 47d6113fee Submit nested 2023-06-28 14:33:52 +01:00
Adria Navarro a95a5f1cb2 Populate fields 2023-06-28 14:33:52 +01:00
Adria Navarro 758b4f8254 Allow open by default for field groups 2023-06-28 14:33:52 +01:00
Adria Navarro 352ea72c53 Select and conditional fields 2023-06-28 14:33:52 +01:00
Adria Navarro 8a7d610faf Move creation pool on the connect step 2023-06-28 14:33:51 +01:00
Adria Navarro f2d41addbd Unify prettier 2023-06-28 14:33:51 +01:00
Adria Navarro c9bee9e423 Display errors 2023-06-28 14:33:51 +01:00
Adria Navarro 94b084a245 Update mssql to latest 2023-06-28 14:33:51 +01:00
Adria Navarro 1e5492b18d Type mssql 2023-06-28 14:33:51 +01:00
mike12345567 25d0f3f518 Adding settings tab for SQL datasources. 2023-06-28 11:59:53 +01:00
Peter Clement 87768fd577 update error messages: 2023-06-28 09:28:40 +01:00
Peter Clement fed6a83bca remove incorrect psql codes 2023-06-28 09:18:41 +01:00
Andrew Kingston ee74900abb Update comments 2023-06-27 17:45:24 +01:00
Andrew Kingston f0c8cb82b2 Remove unused tenantId 2023-06-27 17:43:52 +01:00
Andrew Kingston 801f5655ac Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-27 16:50:51 +01:00
Michael Drury f7cdf5f2bc Merge pull request #11001 from Budibase/feature/custom-role-readable-ids
Custom roles - readable IDs
2023-06-27 16:17:08 +01:00
Michael Drury 5e8cf41feb Merge pull request #11013 from Budibase/fix/sql-relationship-fixes
Further SQL relationship fixes
2023-06-27 16:16:53 +01:00
Andrew Kingston 8c9d4a9126 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-27 16:09:59 +01:00
Peter Clement cf0300973a add error mapping system 2023-06-27 15:28:10 +01:00
Peter Clement 46a9142676 propagate errors coreectly for datasource plus 2023-06-27 15:27:56 +01:00
mike12345567 fc537a0aab Further PR comments. 2023-06-27 14:56:24 +01:00
Michael Drury a3ebcb2896 Merge pull request #11033 from Budibase/fix/BUDI-7188
Don't sync automation logs from prod to dev app
2023-06-27 12:52:07 +01:00
mike12345567 4d2aa2a67b PR comments. 2023-06-27 12:45:00 +01:00
mike12345567 1d5bc39282 PR comments. 2023-06-27 12:24:50 +01:00
Andrew Kingston cfdd6bafb7 Rewrite how middlewares are ran inside sockets, and fix collaboration 2023-06-27 11:33:23 +01:00
mike12345567 47260f23bf PR comments. 2023-06-27 10:01:06 +01:00
Mel O'Hagan 6f75c5df53 Use any type to fix TypeScript check 2023-06-27 09:59:02 +01:00
Dean eaecd3ab68 Merge remote-tracking branch 'origin/develop' into merge-master 2023-06-27 09:31:35 +01:00
mike12345567 7e79c827a7 Test fixes, as well as issue discovered by test around _id generation and event triggering. 2023-06-26 19:10:04 +01:00
mike12345567 3eff4d85d0 Adding a test case for the removal of automation logs from app sync, as well as adding to the publish/sync filter a check to not carry over automation logs. 2023-06-26 18:52:15 +01:00
Andrew Kingston b7603f8bf1 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-26 17:56:11 +01:00
mike12345567 ced1dd95c7 Updating roles tests to make sure ID always valid. 2023-06-26 16:35:16 +01:00
Dean b6caebe431 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-26 15:51:31 +01:00
melohagan 0ecda93ea9 Fix for $in on ObjectIds (#11014) 2023-06-26 15:07:29 +01:00
mike12345567 1c09913d33 Fix for foreign keys being unsettlable after update, breaking Postgres test. 2023-06-26 15:05:10 +01:00
mike12345567 b94801d10a Merge branch 'develop' of github.com:Budibase/budibase into feature/custom-role-readable-ids 2023-06-26 12:39:41 +01:00
Andrew Kingston 6d38bdcd64 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-26 11:32:54 +01:00
Andrew Kingston 5f407259dc Enable component nesting validation for new apps 2023-06-26 10:39:38 +01:00
Andrew Kingston aebc3b2bb8 Merge branch 'develop' of github.com:Budibase/budibase into grid-block 2023-06-26 09:05:06 +01:00