Commit Graph

23157 Commits

Author SHA1 Message Date
Budibase Staging Release Bot af8e0cba88 v1.3.22-alpha.5 2022-09-20 12:28:59 +00:00
Dean 9271f1e7c4 Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-20 13:26:39 +01:00
Rory Powell a340bedbb0 Merge branch 'develop' into release-fixes 2022-09-20 12:29:29 +01:00
Dean 6aa87fdacb Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-20 12:17:31 +01:00
Budibase Staging Release Bot f826a68b51 Update pro version to 1.3.22-alpha.4 2022-09-20 11:13:44 +00:00
Budibase Staging Release Bot 622c2c4896 v1.3.22-alpha.4 2022-09-20 11:09:59 +00:00
Dean f107d79b84 Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-20 12:08:15 +01:00
Martin McKeaveney dd34f8184f set pro to previous version 2022-09-20 11:55:35 +01:00
Dean 5f7cfb5731 Filter 'link' fields from the Current User bindings 2022-09-20 11:09:58 +01:00
Rory Powell e62094c8c8 Merge branch 'develop' into release-fixes 2022-09-20 11:08:54 +01:00
Rory Powell b8d493a65c Invert template display logic to fix cypress 2022-09-20 10:59:12 +01:00
Dean e387ee2591 Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-20 10:58:12 +01:00
Budibase Staging Release Bot e71197d8d8 Update pro version to 1.3.22-alpha.3 2022-09-20 09:54:59 +00:00
Budibase Staging Release Bot 9a6670cc54 v1.3.22-alpha.3 2022-09-20 09:52:49 +00: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 380542d128 Wrap licensing banners and modals in feature flag, disable logo 2022-09-20 10:15:28 +01:00
Dean 5354231e04 Removed redundant display variable from user bindings 2022-09-20 10:15:23 +01:00
Rory Powell e408692647 Change 'Plugins' nav item badge to 'Beta' 2022-09-20 10:13:40 +01:00
Dean 15818d9d62 Minor change to ensure correct labelling for OAuthToken binding 2022-09-20 10:07:07 +01:00
Dean 674263fe9f Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-20 09:16:40 +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
Budibase Staging Release Bot 4777c7ddb0 Update pro version to 1.3.22-alpha.2 2022-09-19 11:50:41 +00:00
Budibase Staging Release Bot 5073d086ca v1.3.22-alpha.2 2022-09-19 11:47:32 +00:00
Budibase Staging Release Bot 1963382d79 Update pro version to 1.3.22-alpha.1 2022-09-18 17:10:37 +00:00
Budibase Staging Release Bot db762e7c2d v1.3.22-alpha.1 2022-09-18 17:07:07 +00:00
Martin McKeaveney fc5cd2db18 Merge branch 'develop' of github.com:Budibase/budibase into develop 2022-09-18 17:54:32 +01:00
Martin McKeaveney 8825edd093 re-add missing reference to name variable in plugins 2022-09-18 16:00:51 +01:00
Budibase Staging Release Bot 058ae96e0f Update pro version to 1.3.22-alpha.0 2022-09-18 12:47:20 +00:00
Budibase Staging Release Bot a3ecd6c8bd v1.3.22-alpha.0 2022-09-18 12:43:54 +00:00
Martin McKeaveney f1dee80961 merge 2022-09-18 13:30:16 +01:00
Budibase Staging Release Bot 91b678223c Update pro version to 1.3.21-alpha.2 2022-09-18 09:52:17 +00:00
Budibase Staging Release Bot 361cc7577c v1.3.21-alpha.2 2022-09-18 09:48:19 +00:00
Martin McKeaveney b604a8a52a
Merge pull request #7792 from Budibase/feature/plugin-pro
Plugin pro integration
2022-09-18 10:34:06 +01:00
Budibase Release Bot 9297be8b41 Update pro version to 1.3.21 2022-09-17 10:44:20 +00:00
Budibase Release Bot 19ed43cb81 v1.3.21 2022-09-17 10:41:13 +00:00
mike12345567 8bb51113bc Fix for #7811 - Fixing an issue with the query binding builder - when executing the query you could no longer enrich the value binding. 2022-09-17 10:45:44 +01:00
Budibase Staging Release Bot fd29e61c1d Update pro version to 1.3.21-alpha.1 2022-09-16 17:39:34 +00:00
Budibase Staging Release Bot 01d92902c4 v1.3.21-alpha.1 2022-09-16 17:36:27 +00:00
Mitch-Budibase 3be14d4d80 Merge branch 'develop' into Cypress-Smoke 2022-09-16 17:56:52 +01:00
Mitch-Budibase 2af219cf84 createComponents Test
Skip test file - these will be replaced with API tests. Leaving them skipped for now to be used as reference for API testing
2022-09-16 17:56:06 +01:00
Dean b97c4590f7 Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-16 17:34:22 +01:00
Dean 99b730105f Minor fix to add categories for rest bindings 2022-09-16 17:32:50 +01:00
Budibase Staging Release Bot e1c6643746 Update pro version to 1.3.21-alpha.0 2022-09-16 15:33:56 +00:00
Budibase Staging Release Bot 95d427cdf7 v1.3.21-alpha.0 2022-09-16 15:30:27 +00:00
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