1
0
Fork 0
mirror of synced 2024-09-11 15:08:05 +12:00
Commit graph

13798 commits

Author SHA1 Message Date
Budibase Staging Release Bot
7b8b8a61ac Update pro version to 1.3.22-alpha.5 2022-09-20 12:32:31 +00:00
Dean
281cec4401 Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-20 13:32:25 +01:00
Budibase Release Bot
b81615b3b0 v1.3.22 2022-09-20 12:29:11 +00:00
Budibase Staging Release Bot
a3eaff524d v1.3.22-alpha.5 2022-09-20 12:28:59 +00:00
Dean
2aa4ee6635 Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-20 13:26:39 +01:00
Rory Powell
9704238ab4 Merge branch 'develop' into release-fixes 2022-09-20 12:29:29 +01:00
Dean
d6e9b1210c 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
7a2cbbd1c0 Update pro version to 1.3.22-alpha.4 2022-09-20 11:13:44 +00:00
Budibase Staging Release Bot
a430f01916 v1.3.22-alpha.4 2022-09-20 11:09:59 +00:00
Dean
f88159a54c Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-20 12:08:15 +01:00
Martin McKeaveney
db8674d43b set pro to previous version 2022-09-20 11:55:35 +01:00
Dean
a6cee09812 Filter 'link' fields from the Current User bindings 2022-09-20 11:09:58 +01:00
Rory Powell
2a3c18a59e Merge branch 'develop' into release-fixes 2022-09-20 11:08:54 +01:00
Rory Powell
72abfd8e52 Invert template display logic to fix cypress 2022-09-20 10:59:12 +01:00
Dean
7e7d0bb867 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
b5ca32c39a Update pro version to 1.3.22-alpha.3 2022-09-20 09:54:59 +00:00
Budibase Staging Release Bot
46d51b6a0c v1.3.22-alpha.3 2022-09-20 09:52:49 +00:00
Rory Powell
f7ec431a45 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
f699bf1b56 Wrap licensing banners and modals in feature flag, disable logo 2022-09-20 10:15:28 +01:00
Dean
d0d63f14b0 Removed redundant display variable from user bindings 2022-09-20 10:15:23 +01:00
Rory Powell
7018652445 Change 'Plugins' nav item badge to 'Beta' 2022-09-20 10:13:40 +01:00
Dean
58d96d3a6b Minor change to ensure correct labelling for OAuthToken binding 2022-09-20 10:07:07 +01:00
Dean
a28b9aea0a Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-20 09:16:40 +01:00
Rory Powell
fca1dd72cd 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
5cd3c5822c Update pro version to 1.3.22-alpha.2 2022-09-19 11:50:41 +00:00
Budibase Staging Release Bot
38650d5d68 v1.3.22-alpha.2 2022-09-19 11:47:32 +00:00
Budibase Staging Release Bot
f37aef3365 Update pro version to 1.3.22-alpha.1 2022-09-18 17:10:37 +00:00
Budibase Staging Release Bot
0165802b59 v1.3.22-alpha.1 2022-09-18 17:07:07 +00:00
Martin McKeaveney
54699e2c8b Merge branch 'develop' of github.com:Budibase/budibase into develop 2022-09-18 17:54:32 +01:00
Martin McKeaveney
92221fe115 re-add missing reference to name variable in plugins 2022-09-18 16:00:51 +01:00
Budibase Staging Release Bot
2693414893 Update pro version to 1.3.22-alpha.0 2022-09-18 12:47:20 +00:00
Budibase Staging Release Bot
d10a3d2b63 v1.3.22-alpha.0 2022-09-18 12:43:54 +00:00
Martin McKeaveney
915405275d merge 2022-09-18 13:30:16 +01:00
Budibase Staging Release Bot
13eb959787 Update pro version to 1.3.21-alpha.2 2022-09-18 09:52:17 +00:00
Budibase Staging Release Bot
7186c83197 v1.3.21-alpha.2 2022-09-18 09:48:19 +00:00
Martin McKeaveney
9b5ed59f34 Merge pull request #7792 from Budibase/feature/plugin-pro
Plugin pro integration
2022-09-18 10:34:06 +01:00
Budibase Release Bot
1d00a4e5a2 Update pro version to 1.3.21 2022-09-17 10:44:20 +00:00
Budibase Release Bot
451c0ae468 v1.3.21 2022-09-17 10:41:13 +00:00
mike12345567
5f8f34f6f3 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
085f0d618d Update pro version to 1.3.21-alpha.1 2022-09-16 17:39:34 +00:00
Budibase Staging Release Bot
18cff49cfc v1.3.21-alpha.1 2022-09-16 17:36:27 +00:00
Mitch-Budibase
8bd2defb28 Merge branch 'develop' into Cypress-Smoke 2022-09-16 17:56:52 +01:00
Mitch-Budibase
f3ecc4e0f3 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
09ff6a2556 Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-16 17:34:22 +01:00
Dean
5347a8339c Minor fix to add categories for rest bindings 2022-09-16 17:32:50 +01:00
Budibase Staging Release Bot
cc9898f2ce Update pro version to 1.3.21-alpha.0 2022-09-16 15:33:56 +00:00
Budibase Staging Release Bot
d6c7d0be7f v1.3.21-alpha.0 2022-09-16 15:30:27 +00:00
mike12345567
ee40819c9e Merge branch 'master' of github.com:Budibase/budibase into develop 2022-09-16 16:13:20 +01:00
Budibase Staging Release Bot
7175ada5df Update pro version to 1.3.19-alpha.7 2022-09-16 11:37:15 +00:00
Budibase Release Bot
e0d65501b8 Update pro version to 1.3.20 2022-09-16 11:36:42 +00:00
Budibase Staging Release Bot
e6cd8bc99a v1.3.19-alpha.7 2022-09-16 11:33:30 +00:00
Budibase Release Bot
b4b228c6fa v1.3.20 2022-09-16 11:33:12 +00:00
Michael Drury
8451a0aec9 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
18ab626d1c Update pro version to 1.3.19-alpha.6 2022-09-16 10:44:42 +00:00
Budibase Staging Release Bot
2bf74722e0 v1.3.19-alpha.6 2022-09-16 10:41:17 +00:00
mike12345567
6bad41e3ce 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
4f25c6aea9 Update pro version to 1.3.19-alpha.5 2022-09-16 08:38:16 +00:00
Budibase Staging Release Bot
a886fb8693 v1.3.19-alpha.5 2022-09-16 08:35:09 +00:00
Andrew Kingston
5bcb4c5393 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
7736acd0c0 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
64c03dfb1b Update pro version to 1.3.19-alpha.4 2022-09-15 20:25:55 +00:00
Budibase Staging Release Bot
7afac4f4f1 v1.3.19-alpha.4 2022-09-15 20:22:50 +00:00
Martin McKeaveney
c86bdffc52 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
d6c8527340 tidy up 2022-09-15 20:09:23 +01:00
Martin McKeaveney
bc090f5f9d better tests and cleaner import for server 2022-09-15 19:51:11 +01:00
mike12345567
fc8dc9f176 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
5b9c3a5608 Some minor fixes, plus typescript conversion to avoid issue in future. 2022-09-15 18:43:07 +01:00
Budibase Staging Release Bot
42651a2fe2 Update pro version to 1.3.19-alpha.3 2022-09-15 17:22:04 +00:00
Budibase Staging Release Bot
2e7fe4b41d v1.3.19-alpha.3 2022-09-15 17:18:38 +00:00
Budibase Release Bot
e4185e98aa Update pro version to 1.3.19 2022-09-15 16:43:41 +00:00
Budibase Release Bot
c5c45f81bd v1.3.19 2022-09-15 16:40:41 +00:00
Dean
42984d7b63 Minor update 2022-09-15 16:50:51 +01:00
Dean
78d72b78cb Fix to include the current user bindings in datasource queries 2022-09-15 16:39:25 +01:00
Andrew Kingston
7914bba724 Fix usages of className in organisation settings page 2022-09-15 16:32:36 +01:00
Andrew Kingston
206714869d 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
6a38a798b4 Update pro version to 1.3.19-alpha.2 2022-09-15 14:22:56 +00:00
Budibase Staging Release Bot
f88c8511a4 v1.3.19-alpha.2 2022-09-15 14:19:01 +00:00
mike12345567
b9321701b8 Merge branch 'develop' of github.com:Budibase/budibase into feature/plugin-pro 2022-09-15 15:14:18 +01:00
Rory Powell
080f46b828 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
40688f6783 Adding budibase/pro integration for plugins, controlling quota limits. 2022-09-15 14:57:27 +01:00
Rory Powell
a8747a0b6d Ignore empty name validation on app update and change free logo text 2022-09-15 14:23:25 +01:00
Budibase Staging Release Bot
4c801590d6 Update pro version to 1.3.19-alpha.1 2022-09-15 12:49:14 +00:00
Budibase Staging Release Bot
071001aeaf v1.3.19-alpha.1 2022-09-15 12:46:10 +00:00
Rory Powell
060251ab03 Merge pull request #7782 from Budibase/feature/day-pass-pricing
Day pass pricing
2022-09-15 13:36:10 +01:00
Rory Powell
89337c9ceb Merge pull request #5583 from Budibase/feature/bb-logo
BB logo on free plan
2022-09-15 13:29:37 +01:00
Rory Powell
00cef3a047 Don't show budibase logo on free plan in self hosted installations 2022-09-15 13:22:17 +01:00
Rory Powell
a691f4035f Merge branch 'feature/day-pass-pricing' into feature/bb-logo 2022-09-15 13:03:53 +01:00
Dean
4ec4007706 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
c2f6bc9167 Updated copy from the payment modal 2022-09-15 12:45:47 +01:00
Rory Powell
f7fa9969f4 Fixes 2022-09-15 11:59:46 +01:00
Michael Drury
b8462eea0c Merge pull request #7774 from Budibase/events/plugins
Plugin init, imported and deleted events
2022-09-15 12:55:40 +02:00
Rory Powell
4787f9ccab Pre-review tidy, add new badge to plugins 2022-09-15 11:23:51 +01:00
Rory Powell
086d9ebdf9 Merge branch 'develop' into feature/day-pass-pricing 2022-09-15 10:56:50 +01:00
Budibase Staging Release Bot
329f39e559 Update pro version to 1.3.19-alpha.0 2022-09-15 09:38:19 +00:00
Budibase Staging Release Bot
8e429a8de2 v1.3.19-alpha.0 2022-09-15 09:34:28 +00:00
Rory Powell
0f98f2fcaa Merge branch 'master' into develop 2022-09-15 10:19:56 +01:00
Dean
f0f222f9ea 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
8cfd6a9faa Merge branch 'develop' into feature/day-pass-pricing 2022-09-15 08:55:33 +01:00
Martin McKeaveney
ddc585fad3 Merge branch 'develop' into qa/qa-core-jest 2022-09-15 01:18:58 +01:00
Martin McKeaveney
fdbe429581 complete refactor and total type safety of test suite - making use of OpenAPI types throughout 2022-09-15 00:58:08 +01:00