Commit Graph

5471 Commits

Author SHA1 Message Date
Martin McKeaveney 71e9f9c191 make sure rows call goes to real couch 2022-09-26 18:46:09 +01:00
Martin McKeaveney d0ad7bbb67 merge with master 2022-09-26 17:57:23 +01:00
Martin McKeaveney bbed2bd0af
Merge pull request #7914 from Budibase/bug/sev4/mysql-multiple-statements
Mysql multiple statements
2022-09-26 15:33:39 +01:00
Andrew Kingston aa21f44a3e Update delete endpoints to be called destroy 2022-09-26 14:18:31 +01:00
Andrew Kingston 0ebfad7606 Merge branch 'develop' of github.com:Budibase/budibase into public-api-sdk 2022-09-26 14:15:25 +01:00
Andrew Kingston f056807f79 Always try to migrate navigation settings when importing apps 2022-09-26 13:59:00 +01:00
Martin McKeaveney 1a18e7eba2
Merge pull request #7964 from Budibase/qa/real-couch-integration-tests 2022-09-26 11:10:15 +01:00
Martin McKeaveney 1fdff22c64 only run in test mode if couch url is not passed 2022-09-26 10:40:37 +01:00
Peter Clement a988ff0a14
Merge pull request #7944 from Budibase/pc/automation-fix
Automate fixes
2022-09-26 08:39:47 +01:00
Martin McKeaveney eae2f83225
Merge pull request #7881 from Budibase/feature/email-cc
Add CC and BCC (with multiple email support) to Send Email automation action step
2022-09-25 13:40:33 +01:00
Michael Drury e3f4e744ab PR comments. 2022-09-24 16:55:22 +01:00
Martin McKeaveney e796a86809 using real couch in integration tests 2022-09-24 13:17:21 +01:00
mike12345567 b20db4d22a Adding a migration for the plugin quotas to make sure they are always accurate in self host at startup. 2022-09-24 12:10:09 +01:00
Michael Drury 1b021d35a3 Fixing issue discovered by test. 2022-09-23 22:24:31 +01:00
mike12345567 55685e83fb Fixing a few issues with roles being correctly reverted. 2022-09-23 17:45:26 +01:00
Peter Clement 334ac0d512 Automation fixes 2022-09-23 13:35:27 +01:00
mike12345567 d749286f3e Minor update to feature flag name. 2022-09-23 13:08:18 +01:00
mike12345567 76114aa621 Merge branch 'develop' of github.com:Budibase/budibase into group-fixes 2022-09-22 18:44:16 +01:00
mike12345567 fa8fb88f82 Updating a few core endpoints to better integrate the groups system and make sure users always have the correct role ID updated onto them. 2022-09-22 18:27:43 +01:00
Mel O'Hagan 76f6f9e9b9 Support multiple statements 2022-09-22 16:36:19 +01:00
mike12345567 7a732b8155 Fixing issue that refactoring file caused (some strings renamed to ts rather than js). 2022-09-22 15:18:10 +01:00
mike12345567 a461c25cef Some updates, typescripting some more APIs, as well as fixing a lot of Router creation which did not specify the 'new' operator. 2022-09-22 14:59:28 +01:00
mike12345567 d80cd5042d Adding group app cleanup. 2022-09-21 23:12:38 +01:00
Rory Powell f324e1b729
Merge pull request #7859 from Budibase/feature/enterprise
Enterprise / license override support
2022-09-21 20:18:54 +01:00
Andrew Kingston 2ccdf4b10b Update public API operation IDs to be shorter 2022-09-21 19:11:47 +01:00
Mel O'Hagan a5571fc59a CC and BCC interface 2022-09-21 15:58:04 +01:00
Rory Powell 903808c0d3 License analytics 2022-09-21 15:45:29 +01:00
Andrew Kingston b1ec1fafb4 Fix incorrect event name being sent down websocket when hot reloading component plugins 2022-09-21 09:11:23 +01:00
Rory Powell c3248421d5 Merge branch 'develop' into feature/enterprise 2022-09-20 16:01:28 +01:00
Andrew Kingston 3024a54cd1 Merge branch 'develop' of github.com:Budibase/budibase into public-api-sdk 2022-09-20 15:29:39 +01:00
Andrew Kingston 48d14d9cb3 Merge branch 'develop' of github.com:Budibase/budibase into public-api-sdk 2022-09-20 11:25:54 +01:00
Andrew Kingston 3e050e965f Add operationIds to public API 2022-09-20 11:24:54 +01:00
Rory Powell bcfb491858 Move tenancy/utils to db/tenancy to resolve circular imports between tenancy and db package. This should remove all reliance on the tenancy package from the db package 2022-09-20 10:20:36 +01:00
Rory Powell f984a16942 Add enterprise types and change from @budibase/pro to @budibase/types for licensing types 2022-09-20 08:02:14 +01:00
Martin McKeaveney 8825edd093 re-add missing reference to name variable in plugins 2022-09-18 16:00:51 +01:00
Martin McKeaveney b604a8a52a
Merge pull request #7792 from Budibase/feature/plugin-pro
Plugin pro integration
2022-09-18 10:34:06 +01:00
mike12345567 1505dcbc66 Minor fix - datasource hot reloading was working apart from the the CJS require caching, need to clear down the cache entry before reloading. 2022-09-16 11:25:28 +01:00
Martin McKeaveney 7f6cc6737b
Merge pull request #7646 from Budibase/qa/qa-core-jest
QA Core repo, and Jest API tests running end to end
2022-09-15 21:12:45 +01:00
Martin McKeaveney 65d41fdd20 better tests and cleaner import for server 2022-09-15 19:51:11 +01:00
mike12345567 ef3d0c1098 Some minor fixes, plus typescript conversion to avoid issue in future. 2022-09-15 18:43:07 +01:00
mike12345567 ea90681fef Merge branch 'develop' of github.com:Budibase/budibase into feature/plugin-pro 2022-09-15 15:14:18 +01:00
mike12345567 ef737a7717 Adding budibase/pro integration for plugins, controlling quota limits. 2022-09-15 14:57:27 +01:00
Rory Powell 408fcc725b Ignore empty name validation on app update and change free logo text 2022-09-15 14:23:25 +01:00
Rory Powell 934bba9562
Merge pull request #7782 from Budibase/feature/day-pass-pricing
Day pass pricing
2022-09-15 13:36:10 +01:00
Rory Powell 6834b33932 Merge branch 'feature/day-pass-pricing' into feature/bb-logo 2022-09-15 13:03:53 +01:00
Michael Drury 5e530c7374
Merge pull request #7774 from Budibase/events/plugins
Plugin init, imported and deleted events
2022-09-15 12:55:40 +02:00
Rory Powell ff8760e860 Pre-review tidy, add new badge to plugins 2022-09-15 11:23:51 +01:00
Rory Powell 0980be9377 Merge branch 'develop' into feature/day-pass-pricing 2022-09-15 10:56:50 +01:00
Rory Powell 0b652a085f Merge branch 'master' into develop 2022-09-15 10:19:56 +01:00
Rory Powell 193a262705 Merge branch 'develop' into feature/day-pass-pricing 2022-09-15 08:55:33 +01:00