Commit Graph

23109 Commits

Author SHA1 Message Date
mike12345567 fa7702044d Merge branch 'master' of github.com:Budibase/budibase into develop 2022-09-16 16:13:20 +01:00
Budibase Staging Release Bot 269b284143 Update pro version to 1.3.19-alpha.7 2022-09-16 11:37:15 +00:00
Budibase Release Bot 096b3ee6fc Update pro version to 1.3.20 2022-09-16 11:36:42 +00:00
Budibase Staging Release Bot b86121efe7 v1.3.19-alpha.7 2022-09-16 11:33:30 +00:00
Budibase Release Bot 463d6238d2 v1.3.20 2022-09-16 11:33:12 +00:00
Michael Drury 91e1735ccb
Merge pull request #7801 from Budibase/fix/datasource-hot-reloading
Datasource hot reloading fix
2022-09-16 13:19:39 +02:00
Budibase Staging Release Bot 2c92f091b2 Update pro version to 1.3.19-alpha.6 2022-09-16 10:44:42 +00:00
Budibase Staging Release Bot 7042ffd4b2 v1.3.19-alpha.6 2022-09-16 10:41:17 +00: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
Budibase Staging Release Bot 38cc31dea2 Update pro version to 1.3.19-alpha.5 2022-09-16 08:38:16 +00:00
Budibase Staging Release Bot 12d62cfedb v1.3.19-alpha.5 2022-09-16 08:35:09 +00:00
Andrew Kingston 97302198a3 Move restart of proxy container to after the compose stack has been brought up to ensure container exists 2022-09-16 09:25:14 +01:00
mike12345567 42654622b5 PR comments, removing console logs, as well as trying to get jest tests working in builder. 2022-09-15 22:47:37 +01:00
Budibase Staging Release Bot 31ba6008a9 Update pro version to 1.3.19-alpha.4 2022-09-15 20:25:55 +00:00
Budibase Staging Release Bot 298b2b17d1 v1.3.19-alpha.4 2022-09-15 20:22:50 +00: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 39ceedc87c tidy up 2022-09-15 20:09:23 +01:00
Martin McKeaveney 65d41fdd20 better tests and cleaner import for server 2022-09-15 19:51:11 +01:00
mike12345567 d35864be08 Fixing issue introduced by fix for #7683 - encoding the query string caused handlebars statements to break, this rectifies that. 2022-09-15 19:35:55 +01:00
mike12345567 ef3d0c1098 Some minor fixes, plus typescript conversion to avoid issue in future. 2022-09-15 18:43:07 +01:00
Budibase Staging Release Bot 50f48da032 Update pro version to 1.3.19-alpha.3 2022-09-15 17:22:04 +00:00
Budibase Staging Release Bot 70ca5eab59 v1.3.19-alpha.3 2022-09-15 17:18:38 +00:00
Budibase Release Bot e0cf125316 Update pro version to 1.3.19 2022-09-15 16:43:41 +00:00
Budibase Release Bot 1e621da16b v1.3.19 2022-09-15 16:40:41 +00:00
Dean dcc3c81e7a Minor update 2022-09-15 16:50:51 +01:00
Dean 6ee5d8bea6 Fix to include the current user bindings in datasource queries 2022-09-15 16:39:25 +01:00
Andrew Kingston 5cd66d1436 Fix usages of className in organisation settings page 2022-09-15 16:32:36 +01:00
Andrew Kingston e8ec2c0114 Always restart the proxy service when spinning up the dev stack to account for nginx conf changes 2022-09-15 16:31:29 +01:00
Budibase Staging Release Bot e7bef7a608 Update pro version to 1.3.19-alpha.2 2022-09-15 14:22:56 +00:00
Budibase Staging Release Bot 6c8550e2fb v1.3.19-alpha.2 2022-09-15 14:19:01 +00:00
mike12345567 ea90681fef Merge branch 'develop' of github.com:Budibase/budibase into feature/plugin-pro 2022-09-15 15:14:18 +01:00
Rory Powell 32b6cc4b66
Merge pull request #7788 from Budibase/update-app-name
Ignore empty name validation on app update and change free logo text
2022-09-15 15:06:31 +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
Budibase Staging Release Bot 89a0a0f82b Update pro version to 1.3.19-alpha.1 2022-09-15 12:49:14 +00:00
Budibase Staging Release Bot 9eb4995976 v1.3.19-alpha.1 2022-09-15 12:46:10 +00: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 22fa30036a
Merge pull request #5583 from Budibase/feature/bb-logo
BB logo on free plan
2022-09-15 13:29:37 +01:00
Rory Powell c8789412e2 Don't show budibase logo on free plan in self hosted installations 2022-09-15 13:22:17 +01:00
Rory Powell 6834b33932 Merge branch 'feature/day-pass-pricing' into feature/bb-logo 2022-09-15 13:03:53 +01:00
Dean 117328021c Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing 2022-09-15 12:46:27 +01:00
Dean 59e8e97bbc Updated copy from the payment modal 2022-09-15 12:45:47 +01:00
Rory Powell c2fa270386 Fixes 2022-09-15 11:59:46 +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
Budibase Staging Release Bot 63211a4601 Update pro version to 1.3.19-alpha.0 2022-09-15 09:38:19 +00:00
Budibase Staging Release Bot 04749bf93a v1.3.19-alpha.0 2022-09-15 09:34:28 +00:00
Rory Powell 0b652a085f Merge branch 'master' into develop 2022-09-15 10:19:56 +01:00
Dean 0acdd047fc Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing 2022-09-15 09:06:48 +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
Rory Powell 25282c9455 Show licensed group exceeded notification 2022-09-14 22:37:33 +01:00
Rory Powell 3697a4365b Update usage page 2022-09-14 20:58:58 +01:00
mike12345567 2e5e3ecf3b Merge branch 'develop' of github.com:Budibase/budibase into events/plugins 2022-09-14 18:25:14 +01:00
mike12345567 f7ee55cc0e PR comments. 2022-09-14 18:24:10 +01:00
Dean bcd6b711bf Apps Page update to hide apps when sessions are maxed. General refactoring and updates to the licensing notification flows. 2022-09-14 18:04:58 +01:00
Budibase Staging Release Bot 63b7c9d9c5 Update pro version to 1.3.15-alpha.9 2022-09-14 17:01:11 +00:00
Budibase Staging Release Bot 46eece76b6 v1.3.15-alpha.9 2022-09-14 16:58:05 +00: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
Budibase Release Bot 32b6db3479 Update pro version to 1.3.18 2022-09-14 15:24:43 +00:00
Budibase Release Bot 5bf9d38233 v1.3.18 2022-09-14 15:21:19 +00:00
Martin McKeaveney 0605486965
Merge pull request #7591 from Budibase/fix/platform-email-casing
Fix/platform email casing
2022-09-14 16:09:52 +01:00
Dean e29df0b7b5 Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing 2022-09-14 15:20:49 +01:00
Budibase Staging Release Bot de09eb18ef Update pro version to 1.3.15-alpha.8 2022-09-14 14:03:57 +00:00
Budibase Staging Release Bot cf446aa85b v1.3.15-alpha.8 2022-09-14 14:00:26 +00: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
Dean 8758307d90 Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing 2022-09-14 14:35:54 +01:00
Andrew Kingston 050485eb2f Lint 2022-09-14 14:35:08 +01:00
Martin McKeaveney be396dc3c0 fixing tests 2022-09-14 14:22:53 +01:00
Rory Powell 23594d7d12 Update navigation 2022-09-14 14:20:50 +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 a4af9ad32e Minor fix - remove double friendlyname check. 2022-09-14 13:59:54 +01:00
mike12345567 d7dfb53647 Adding friendly name to plugin screen. 2022-09-14 13:15:33 +01:00
mike12345567 eeda89725d Renaming data source -> datasource as per Mel's request. 2022-09-14 12:11:20 +01:00
Andrew Kingston 02ed382086 Merge branch 'develop' of github.com:Budibase/budibase into develop 2022-09-14 12:01:56 +01:00
Andrew Kingston 7bee35f816 Allow custom components in cloud 2022-09-14 12:01:49 +01:00
Budibase Staging Release Bot f42ae29611 Update pro version to 1.3.15-alpha.7 2022-09-14 10:59:40 +00: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
Budibase Staging Release Bot d410b9a47c v1.3.15-alpha.7 2022-09-14 10:56:15 +00:00
Michael Drury 816a547345
Merge pull request #7758 from Budibase/fix/cli-build
Quick fix for CLI build
2022-09-14 12:43:55 +02:00
Rory Powell f72c53b461 Remove active user pricing and custom invoicing 2022-09-14 11:32:11 +01:00
Peter Clement b78f444654 remove uneeded log 2022-09-14 11:19:09 +01:00
mike12345567 bbe0489af4 Adding better controls for .git checking. 2022-09-14 11:11:20 +01:00
mike12345567 72736e5257 Fixing a minor issue with plugin name not being passed through in CLI function. 2022-09-14 11:04:37 +01:00
mike12345567 e46ddbf65a Fixes from PR comments. 2022-09-14 10:58:01 +01:00
Budibase Staging Release Bot 6c54961c83 Update pro version to 1.3.15-alpha.6 2022-09-14 09:55:53 +00:00
Rory Powell d72494e44b Navigation updates, cookie constant, update link-dependencies and localdomain scripts 2022-09-14 10:53:14 +01:00
Budibase Staging Release Bot d511cc183e v1.3.15-alpha.6 2022-09-14 09:52:46 +00:00
Andrew Kingston 9511fb72c7 Allow component plugins in cloud 2022-09-14 10:14:17 +01:00
Hervé de CHAVIGNY 4020625844 multi mail send to 2022-09-13 18:59:14 -04:00
mike12345567 68a8a66bc7 Defaulting behaviour for empty git repos. 2022-09-13 18:28:03 +01:00
mike12345567 eae8ec97a9 Adding an option to disable top level parent directory creation during CLI plugin init incase using this for git repo creation. 2022-09-13 18:22:15 +01:00
mike12345567 27518cb678 Fixing CLI build - prebuilds required for hashing can be disabled via environment variable. 2022-09-13 18:00:10 +01:00
Martin McKeaveney c4f424cb80 fix circular dependency issues 2022-09-13 17:29:31 +01:00
Peter Clement c521fa1188 fix issue with date range filtering in automations 2022-09-13 17:11:37 +01:00