1
0
Fork 0
mirror of synced 2024-07-02 13:01:09 +12:00
Commit graph

5550 commits

Author SHA1 Message Date
Michael Drury 69abe9c5db Merge branch 'master' of github.com:Budibase/budibase into develop 2022-10-01 15:44:11 +01:00
mike12345567 0182996260 Quick fix for development machines, when running Budibase development stack on systems that are not oracle compatiable it would fail to start due to the lack of dependency. 2022-09-30 15:19:34 +01:00
mike12345567 48514da625 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-09-30 14:55:00 +01:00
mike12345567 6296849012 Minor fix for #8056 - don't return the raw data for the main query execution - but still return for the builder preview. 2022-09-30 12:30:26 +01:00
mike12345567 791f6a36a5 Merge branch 'master' of github.com:Budibase/budibase into feature/plugin-icons 2022-09-30 11:17:43 +01:00
mike12345567 b059d95e02 Fix for #8023 - moving Oracle integration to ESM import rather than CJS. 2022-09-30 10:52:00 +01:00
mike12345567 1f5de9b71d Adding ability for datasource plugins to have a custom icon svg. 2022-09-29 19:30:53 +01:00
Rory Powell ba706319f4 Test fix 2022-09-28 14:03:05 +01:00
Rory Powell 61aafa87cb Create generic quota sync migration 2022-09-28 13:13:37 +01:00
Rory Powell 79d53042d8 Merge branch 'develop' into feature/app-quotas 2022-09-28 12:33:39 +01:00
Rory Powell 59527b29f0 minor renaming 2022-09-28 11:57:58 +01:00
Rory Powell 9af16738e5 Merge develop 2022-09-28 08:56:45 +01:00
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
Mel O'Hagan 59ba882a58 Merge branch 'master' into bug/sev3/display-column-relationship-bug 2022-09-26 16:14:14 +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
Mel O'Hagan 2d3868af26 Ensure display columns are set 2022-09-21 11:53:18 +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
Martin McKeaveney c1dc1aa488
Merge branch 'develop' into qa/qa-core-jest 2022-09-15 01:18:58 +01:00
Martin McKeaveney 3c0b9344d8 complete refactor and total type safety of test suite - making use of OpenAPI types throughout 2022-09-15 00:58:08 +01:00
mike12345567 cf7a9e47a2 Merge branch 'develop' of github.com:Budibase/budibase into events/plugins 2022-09-14 17:48:25 +01:00
Michael Drury dcc70f9679
Merge pull request #7770 from Budibase/fix/datasource-rename
Data source -> datasource throughout code - plus friendly plugin name displayed
2022-09-14 18:47:54 +02:00
mike12345567 d7f38a38bc Adding types for plugin events, specifically for plugin init, import and deletion, this is across the CLI and the server. 2022-09-14 17:35:46 +01:00
Peter Clement 7f43b40685
Merge pull request #7766 from Budibase/fix/pc-fixes
Bug fixes #6836 and #7242
2022-09-14 14:39:10 +01:00
Andrew Kingston 050485eb2f Lint 2022-09-14 14:35:08 +01:00
mike12345567 2216ff1987 Fixing linting issue. 2022-09-14 14:07:00 +01:00
mike12345567 01f115cd6b Merge branch 'develop' of github.com:Budibase/budibase into fix/datasource-rename 2022-09-14 14:06:38 +01:00
mike12345567 eeda89725d Renaming data source -> datasource as per Mel's request. 2022-09-14 12:11:20 +01:00
Andrew Kingston 7bee35f816 Allow custom components in cloud 2022-09-14 12:01:49 +01:00
Andrew Kingston 917ce9e177 Add validation to plugins uploaded using file upload and allow component uploads via non-file sources in cloud 2022-09-14 11:58:59 +01:00
Andrew Kingston 9511fb72c7 Allow component plugins in cloud 2022-09-14 10:14:17 +01:00
mike12345567 781832a52a Fixing issue with plugin import for datasources - extract the integration correctly. 2022-09-13 12:16:00 +01:00
Peter Clement 0d097f48e4 add backend name validation for app creation / update 2022-09-13 11:44:33 +01:00
Andrew Kingston 3bfc91135c Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-eject-blocks 2022-09-13 11:31:45 +01:00
melohagan 8a5545f81f
Merge pull request #7333 from Budibase/feature/select-tables-to-fetch
Allow list of named tables to be fetched
2022-09-13 11:19:49 +01:00
Mel O'Hagan e53f7a1d28 Case insensitive table fetch 2022-09-13 10:55:38 +01:00
Michael Drury 87197b61af
Merge pull request #7574 from Budibase/bug/sev4/delete-formula-column
Exclude formula columns from Sql drop column
2022-09-13 11:27:59 +02:00
Andrew Kingston 00cbf6cf37 Refactor server websocket dependency tree to fix jest tests 2022-09-13 09:54:25 +01:00
melohagan f2fe1c86c0
Merge pull request #7737 from Budibase/bug/sev3/foreign-key-bigint-smallint
Postgres (and other external DBs) support foreign key bigint -> smallint
2022-09-13 08:26:02 +01:00
Andrew Kingston 3d57010a10 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience-websocket 2022-09-12 20:00:32 +01:00
mike12345567 d737e0f8eb Updating plugin backend, refactoring a bit, correctly allowing a set of headers to be used for a URL. 2022-09-12 19:12:05 +01:00
mike12345567 40e579e0b7 Updating add/delete process to have better notifications, removing some errors. 2022-09-12 17:43:13 +01:00
mike12345567 036487378c Refactoring some plugin adding work - changing how source is specified to remove lower casing. 2022-09-12 17:04:27 +01:00
mike12345567 245569ff9e Reverting organisation page changes. 2022-09-12 16:21:47 +01:00
mike12345567 f7d357974c Merge branch 'develop' of github.com:Budibase/budibase into feature/plugin-management-ui 2022-09-12 15:34:34 +01:00
mike12345567 3c857ec501 Prefer worker/app port to generic port env variable - #7736. 2022-09-12 15:17:39 +01:00
mike12345567 cd6874b2b0 Fixing an intermettient test issue. 2022-09-12 15:16:31 +01:00
Mel O'Hagan 0ed5647782 lint 2022-09-12 14:22:07 +01:00
Mel O'Hagan 3b928e0ffb Compare string versions of relationship columns 2022-09-12 14:21:32 +01:00
Rory Powell 6644a20d2f Merge branch 'master' into develop 2022-09-12 14:05:36 +01:00
Martin McKeaveney 8a3126826d
Merge pull request #7734 from Budibase/fix/cr-header
Fix/cr header
2022-09-12 12:22:35 +01:00
Rory Powell e2b5c7b4ef Merge branch 'develop' into feature/day-pass-pricing-temp 2022-09-12 11:33:02 +01:00
Martin McKeaveney bd7c62e48c adding friendlyname for legacy HTTP support 2022-09-12 10:18:18 +01:00
Martin McKeaveney 8ef5324048 provide fix for CR header and backwards compatibility with legacy servers 2022-09-12 10:00:05 +01:00