Commit Graph

4484 Commits

Author SHA1 Message Date
Dean b6caebe431 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-26 15:51:31 +01:00
Andrew Kingston aebc3b2bb8 Merge branch 'develop' of github.com:Budibase/budibase into grid-block 2023-06-26 09:05:06 +01:00
mike12345567 3d3efadb37 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-23 15:19:49 +01:00
melohagan 3aca0c0ed3 Null safety (#11007) 2023-06-23 14:48:07 +01:00
Dean fd8400bee5 PR feedback and removed some comments 2023-06-23 11:56:59 +01:00
Andrew Kingston 007b6d605b Merge pull request #10917 from Budibase/fix/datasource-409
Fix datasource conflicts
2023-06-23 11:54:15 +01:00
melohagan 0860a5b248 Exclude entities from datasource env processing (#11000) 2023-06-22 17:35:47 +01:00
mike12345567 58d7293798 PR suggestion. 2023-06-22 13:25:37 +01:00
mike12345567 5373b867e1 Fix for #10949 - the relationship types were always locked to be the same, which means that the foreign key wasn't being updated correctly as the backend was not aware of which side was the one-to-many side. 2023-06-22 12:32:39 +01:00
Michael Drury e1741937ae Removing logging of error in coercion - this was creating noise in errors channel. 2023-06-21 12:08:39 +01:00
Andrew Kingston 1403ee59ce Use app ID as part of room key for grid websocket to fix issues with dev/prod tables having the same table ID but being different tables 2023-06-21 08:51:43 +01:00
Andrew Kingston 3f20a3a439 Enable collaboration for public users and fix collaboration for non-devs 2023-06-21 08:33:58 +01:00
mike12345567 cbfeea121c Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-20 18:09:23 +01:00
melohagan 9e9cece59e Clone user (#10974) 2023-06-20 17:07:34 +01:00
melohagan b0debf17ef Table disappears from side bar when changing display name (#10909)
* Pass sourceId on fetch tables

* Use ExternalTable type
2023-06-20 17:07:12 +01:00
Dean 998f1806aa Updated analytics tests to account for the embedded 2023-06-20 16:29:09 +01:00
Michael Drury 958cabee52 Merge pull request #10921 from Budibase/fix/airgap-templates-call
update airgap script and enable support for offline mode
2023-06-20 13:51:10 +01:00
Dean f04f42546a Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-20 12:33:48 +01:00
Dean 602ea9bc4e General tidying and refactoring. Updated the publish button behaviour to also take into account revert and version update behaviours. 2023-06-20 12:33:18 +01:00
Adria Navarro cdd15fd75f Merge pull request #10953 from Budibase/budi-7115-sql-schema-export
BUDI-7115 - Sql schema export
2023-06-20 11:57:46 +01:00
Adria Navarro 8ab5913eb9 Change url 2023-06-20 11:33:38 +01:00
Adria Navarro 6ed5894441 Type 2023-06-20 11:14:23 +01:00
Dean c1248eed12 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-20 10:08:18 +01:00
mike12345567 3955b00bbc Merge branch 'develop' of github.com:Budibase/budibase into fix/airgap-templates-call 2023-06-19 18:57:17 +01:00
Michael Drury c5270ee323 Merge pull request #10959 from Budibase/fix/integration-tests
Integration test updates and improved logging
2023-06-19 18:52:24 +01:00
mike12345567 289a75fc9a Few minor updates to the integration suite to make it easier to decipher what is happening under the hood, as well as making it easier to log from these (where there is no pino logging available, importing backend-core breaks things). Also added a new script which can be used to get local environment setup as needed to run qa-core tests. Finally, xdescribe for the failing test until can work out what is wrong with MongoDB installation in QA environment. 2023-06-19 18:28:38 +01:00
Adria Navarro 718fe1efc6 Implement mssql and tests 2023-06-19 17:56:12 +01:00
Adria Navarro c44b10eadf Lint 2023-06-19 17:56:12 +01:00
Adria Navarro e21dca5582 Implement and test mysql sql dump 2023-06-19 17:56:12 +01:00
Adria Navarro ab5b8716c0 Get mysql schema 2023-06-19 17:56:12 +01:00
Adria Navarro d337c52adf Add feature flags 2023-06-19 17:56:11 +01:00
Adria Navarro 7a4eb3113d Add external schema endpoint 2023-06-19 17:56:11 +01:00
Adria Navarro dbcf7814a8 Support ssl 2023-06-19 17:56:11 +01:00
Adria Navarro e7026d4aed Get schema function 2023-06-19 17:56:11 +01:00
Adria Navarro 7bd0078210 Clean code 2023-06-19 17:55:47 +01:00
Adria Navarro a0bfebf53d Merge pull request #10894 from Budibase/budi-7010/frontend-encrypt-app-imports
BUDI-7010 - Frontend decrypt app imports
2023-06-19 11:18:38 +01:00
Dean 2304032423 Added embed state, behaviours and event tracking to client app. UI/UX Refactoring 2023-06-16 12:30:08 +01:00
Rory Powell 5f716a62a4 Revert "Merge branch 'develop' into master"
This reverts commit 67fb9de7f4, reversing
changes made to ebec885b0a.
2023-06-16 10:13:43 +01:00
Michael Drury 58c26d563e Fixing where getCachedLicense is retrieved from. 2023-06-15 23:29:34 +01:00
Michael Drury a1d8ad047a Quick fix suggested by Rory to make use of the cached license when fetching the app package. 2023-06-15 22:51:33 +01:00
mike12345567 d84051ccfd Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-15 17:08:08 +01:00
mike12345567 67e2ce86ce Adding a license mechanism to the app package call so that public apps can still return what license the app utilises. This is retrieved based on the tenant of the app - we only attach the license type so as to not expose further information than is necessary. 2023-06-15 16:33:07 +01:00
Martin McKeaveney dd8e54c5e1 update airgap script and enable support for offline mode 2023-06-15 15:20:14 +01:00
Adria Navarro df3afe2a7c Merge pull request #10918 from Budibase/budi-5262/support_pg_client_cert
Budi 5262 - Support pg client cert
2023-06-15 12:40:16 +01:00
Adria Navarro b7f0387577 Merge branch 'develop' into budi-5262/support_pg_client_cert 2023-06-15 11:13:52 +01:00
Adria Navarro 4d3ab040bf Support postgres client certificates 2023-06-15 11:06:01 +01:00
Adria Navarro f446bd96dd Merge branch 'master' into backmerge-master 2023-06-15 10:16:21 +01:00
Andrew Kingston 3cbebaf40d Restore original comment 2023-06-15 09:29:46 +01:00
Andrew Kingston 99a8fc7c12 Revert websocket changes and just fetch datasources constantly 2023-06-15 09:27:45 +01:00
Andrew Kingston 5e5dc902d1 Broadcast datasource change via websocket when making changes to tables 2023-06-15 09:04:21 +01:00