Commit Graph

8562 Commits

Author SHA1 Message Date
mike12345567 ce6c5bfa68 Base connection work - extending the base integration to include the option of a connection check function. 2023-05-05 15:47:55 +01:00
mike12345567 c880282be3 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-05-05 15:44:32 +01:00
Budibase Release Bot c73f9eb12f Update pro version to 2.6.7 2023-05-05 14:31:33 +00:00
Budibase Release Bot 1de22e3758 v2.6.7 2023-05-05 14:30:04 +00:00
Dean 03c048f978 Merge remote-tracking branch 'origin/master' into fix/inclusion-row-parsing 2023-05-05 15:22:49 +01:00
Dean 0aeb06bb2b Merge commit 2023-05-05 13:39:59 +01:00
Adria Navarro 1c0da8ff29 Merge branch 'develop' into chore/npmless-builds 2023-05-05 13:31:45 +01:00
Budibase Release Bot 83dabb6fc4 Update pro version to 2.6.6 2023-05-05 11:52:37 +00:00
Budibase Release Bot 0f8d74157c v2.6.6 2023-05-05 11:50:53 +00:00
melohagan 25b42f0a28 Rename Integromat to Make. Update logo. (#10492) 2023-05-05 12:41:24 +01:00
Budibase Staging Release Bot 21ffea56c4 Update pro version to 2.5.10-alpha.3 2023-05-05 11:20:50 +00:00
Budibase Release Bot cd08227d21 Update pro version to 2.6.5 2023-05-05 11:20:15 +00:00
Budibase Staging Release Bot 58e2ea7c6c v2.5.10-alpha.3 2023-05-05 11:19:15 +00:00
Budibase Release Bot eb5e962e65 v2.6.5 2023-05-05 11:18:39 +00:00
Martin McKeaveney 1c81cc4b4d Merge pull request #10483 from Budibase/fix/empty-attachment-row-import
Fix for row import failure caused by empty attachment parsing.
2023-05-05 12:01:04 +01:00
Michael Drury cfae0f6811 Merge pull request #10487 from Budibase/fix/automation-log-issue
Potential fix for automation log issue
2023-05-05 11:59:25 +01:00
Budibase Staging Release Bot 87f5c9353a Update pro version to 2.5.10-alpha.2 2023-05-05 10:57:40 +00:00
Budibase Staging Release Bot 4cd5b39c3a v2.5.10-alpha.2 2023-05-05 10:55:55 +00:00
Budibase Release Bot 488ce6c072 Update pro version to 2.6.4 2023-05-05 10:49:18 +00:00
Budibase Release Bot 76ad8bca7c v2.6.4 2023-05-05 10:47:43 +00:00
Dean b0ff61c9ec Feedback update. Console.error to logging.logalert 2023-05-05 09:24:57 +01:00
Budibase Release Bot 541c5ef1c2 Update pro version to 2.6.3 2023-05-05 06:59:33 +00:00
Budibase Release Bot 0aa270ad0a v2.6.3 2023-05-05 06:58:10 +00:00
melohagan b790a1177e Don't validate empty options picker (#10302) 2023-05-05 07:50:01 +01:00
mike12345567 0d7959f720 Fixing some un-identified listeners, queue messages not being correctly printed, also improving the mechanism for detecting if in the main thread or not. 2023-05-04 17:20:21 +01:00
Budibase Release Bot 303a029184 Update pro version to 2.6.2 2023-05-04 13:34:48 +00:00
Budibase Release Bot 2086b5d5dd v2.6.2 2023-05-04 13:33:20 +00:00
Martin McKeaveney 50de32a8a0 Merge pull request #10452 from Budibase/feature/clustering-support
attaching clustered mode to an env var
2023-05-04 14:25:23 +01:00
Martin McKeaveney 41c131050c lint 2023-05-04 13:43:53 +01:00
Martin McKeaveney 167dfd39d7 fix ts build 2023-05-04 13:32:17 +01:00
Dean f24e511a63 Merge remote-tracking branch 'origin/master' into fix/empty-attachment-row-import 2023-05-04 13:00:52 +01:00
Dean 5498cc86bd Refactor to fix tests and added an extra empty scenario 2023-05-04 12:58:45 +01:00
Dean a1fdff8df8 Linting 2023-05-04 12:25:30 +01:00
Dean f8da7a9f28 Linting 2023-05-04 12:12:47 +01:00
Dean 56a1b068cc Added json parse option for row import attachment values 2023-05-04 11:52:20 +01:00
Budibase Release Bot cde5259e44 Update pro version to 2.6.1 2023-05-04 10:40:47 +00:00
Budibase Release Bot 2774e92d83 v2.6.1 2023-05-04 10:39:20 +00:00
Dean 98963c1505 Fix for inclusion parsing for arrays and options. View table fix to hide edit button 2023-05-04 11:21:24 +01:00
Budibase Release Bot 2cbae832c4 Update pro version to 2.6.0 2023-05-04 10:02:34 +00:00
Budibase Release Bot 56eb0a318c v2.6.0 2023-05-04 10:00:54 +00:00
Adria Navarro ce0d527d75 Merge branch 'chore/npmless-builds' into chore/pipeline_npm_version_updates
# Conflicts:
#	packages/backend-core/package.json
#	packages/bbui/package.json
#	packages/builder/package.json
#	packages/cli/package.json
#	packages/client/package.json
#	packages/frontend-core/package.json
#	packages/sdk/package.json
#	packages/server/package.json
#	packages/shared-core/package.json
#	packages/string-templates/package.json
#	packages/types/package.json
#	packages/worker/package.json
#	yarn.lock
2023-05-04 10:29:45 +01:00
Budibase Release Bot dd07f979f9 Update pro version to 2.5.10 2023-05-04 07:55:58 +00:00
Budibase Release Bot 2506f61812 v2.5.10 2023-05-04 07:54:29 +00:00
Budibase Staging Release Bot 77116bf4c2 Update pro version to 2.5.10-alpha.1 2023-05-03 17:30:27 +00:00
Budibase Staging Release Bot 991e91e204 v2.5.10-alpha.1 2023-05-03 17:28:55 +00:00
Adria Navarro fa6e6b53f8 Merge pull request #10462 from Budibase/fix/budi-6789-import-data-empty-date-is-not-allowed
Fix - Budi 6789 import data empty date is not allowed
2023-05-03 19:22:06 +02:00
Adria Navarro ba41fe97e1 Merge branch 'develop' into chore/npmless-builds 2023-05-03 18:00:12 +01:00
Budibase Staging Release Bot 7facf0c9ea Update pro version to 2.5.10-alpha.0 2023-05-03 15:25:16 +00:00
Budibase Staging Release Bot 9e986ac69d v2.5.10-alpha.0 2023-05-03 15:23:47 +00:00
Rory Powell e1a147e823 Merge branch 'master' into develop 2023-05-03 16:06:42 +01:00
Budibase Staging Release Bot eb973386d8 Update pro version to 2.5.6-alpha.45 2023-05-03 13:16:23 +00:00
Budibase Staging Release Bot 1fcc64154e v2.5.6-alpha.45 2023-05-03 13:14:55 +00:00
Budibase Staging Release Bot ecff055b3e Update pro version to 2.5.6-alpha.44 2023-05-02 18:11:31 +00:00
Budibase Staging Release Bot b911b04a03 v2.5.6-alpha.44 2023-05-02 18:09:57 +00:00
Budibase Staging Release Bot 7d22394d6e Update pro version to 2.5.6-alpha.43 2023-05-02 14:44:15 +00:00
Budibase Staging Release Bot cf2488cd35 v2.5.6-alpha.43 2023-05-02 14:42:41 +00:00
Adria Navarro 00cd09d6d4 Merge branch 'develop' into chore/npmless-builds 2023-05-02 14:47:03 +01:00
Adria Navarro 9ffd43b682 Merge branch 'chore/npmless-builds' into chore/pipeline_npm_version_updates 2023-05-02 14:07:44 +01:00
Adria Navarro 1d041a3dd5 Support nulls when optional 2023-05-02 12:48:05 +01:00
Adria Navarro 6e7c78362e Return null instead of undefined 2023-05-02 12:46:53 +01:00
Adria Navarro 650cbc1f01 Handle cast as undefineds 2023-05-02 11:57:18 +01:00
Adria Navarro c87cc39cea Add basic tests 2023-05-02 10:44:25 +01:00
Adria Navarro 29df12c247 Add csvutils 2023-05-02 10:34:45 +01:00
Budibase Staging Release Bot 003ac1c380 Update pro version to 2.5.6-alpha.42 2023-05-02 08:45:36 +00:00
Budibase Staging Release Bot 9f7b212f22 v2.5.6-alpha.42 2023-05-02 08:44:05 +00:00
Budibase Staging Release Bot 6026794e89 Update pro version to 2.5.6-alpha.41 2023-04-29 09:08:19 +00:00
Budibase Staging Release Bot a89d7f1f46 v2.5.6-alpha.41 2023-04-29 09:06:58 +00:00
Martin McKeaveney 36397bb77d enabling cluster support for ratelimit cache 2023-04-28 20:23:39 +01:00
Budibase Release Bot 778da79a57 Update pro version to 2.5.9 2023-04-28 16:29:24 +00:00
Budibase Release Bot 9e62b6dc4b v2.5.9 2023-04-28 16:26:24 +00:00
melohagan 8742fb39d3 is empty lucene query with OR fix (#10451)
* empty lucene query with OR fix

* Fix unit test
2023-04-28 17:17:32 +01:00
Budibase Staging Release Bot ecb12272da Update pro version to 2.5.6-alpha.40 2023-04-28 11:06:45 +00:00
Budibase Staging Release Bot dadf6128bc v2.5.6-alpha.40 2023-04-28 11:05:14 +00:00
Budibase Staging Release Bot eb86127bbe Update pro version to 2.5.6-alpha.39 2023-04-27 16:20:56 +00:00
Budibase Staging Release Bot b654985ab9 v2.5.6-alpha.39 2023-04-27 16:18:51 +00:00
mike12345567 71f2287474 Merge branch 'develop' of github.com:Budibase/budibase into fix/export-no-auto-logs 2023-04-27 16:44:26 +01:00
Budibase Staging Release Bot bea67941fe Update pro version to 2.5.6-alpha.38 2023-04-27 15:18:15 +00:00
Budibase Staging Release Bot d223643e93 v2.5.6-alpha.38 2023-04-27 15:16:50 +00:00
Budibase Staging Release Bot a896a75f8f Update pro version to 2.5.6-alpha.37 2023-04-27 13:48:47 +00:00
Budibase Staging Release Bot 06cdb7c202 v2.5.6-alpha.37 2023-04-27 13:47:04 +00:00
mike12345567 5363693ac3 Removing automation logs from app exports as they are not useful - they take up space and the imported app won't have ran any automations yet. I have added it as a flag so that this does not affect backups (as you would want to maintain logs for backups). 2023-04-27 11:36:52 +01:00
Budibase Staging Release Bot 1b815c363a Update pro version to 2.5.6-alpha.36 2023-04-27 09:32:55 +00:00
Budibase Staging Release Bot ead89bf0bf v2.5.6-alpha.36 2023-04-27 09:31:32 +00:00
Budibase Staging Release Bot d6e5647b89 Update pro version to 2.5.6-alpha.35 2023-04-27 07:36:01 +00:00
Budibase Staging Release Bot f8d4e95fbd v2.5.6-alpha.35 2023-04-27 07:34:19 +00:00
Budibase Staging Release Bot 34b0a1fa2d Update pro version to 2.5.6-alpha.34 2023-04-26 16:17:58 +00:00
Budibase Staging Release Bot aad034e53e v2.5.6-alpha.34 2023-04-26 16:16:22 +00:00
Pedro Silva e2937d985c Merge pull request #10264 from Budibase/qa-core-datasource-api-tests
Qa core datasource api tests
2023-04-26 17:09:09 +01:00
Pedro Silva 6e79506445 Fix failing test 2023-04-26 16:45:00 +01:00
Budibase Staging Release Bot 2119ef36bd Update pro version to 2.5.6-alpha.33 2023-04-26 15:00:25 +00:00
Budibase Staging Release Bot f6a0a66437 v2.5.6-alpha.33 2023-04-26 14:58:55 +00:00
Pedro Silva 796c50d3e0 Merge branch 'develop' into qa-core-datasource-api-tests 2023-04-26 15:51:47 +01:00
Dean 64a4423c62 Merge remote-tracking branch 'origin/develop' into fix/client-versioning 2023-04-26 14:59:03 +01:00
Budibase Staging Release Bot 71c8fec4db Update pro version to 2.5.6-alpha.32 2023-04-26 13:48:46 +00:00
Budibase Staging Release Bot e178afe171 v2.5.6-alpha.32 2023-04-26 13:47:10 +00:00
Dean dbd73a1135 Merge remote-tracking branch 'origin/develop' into fix/client-versioning 2023-04-26 14:25:09 +01:00
Budibase Staging Release Bot 349f4b426e Update pro version to 2.5.6-alpha.31 2023-04-26 12:18:01 +00:00
Budibase Staging Release Bot 457c1ce0a1 v2.5.6-alpha.31 2023-04-26 12:16:31 +00:00
Budibase Staging Release Bot 3e78989e74 Update pro version to 2.5.6-alpha.30 2023-04-25 19:46:09 +00:00
Budibase Staging Release Bot 26007dcd69 v2.5.6-alpha.30 2023-04-25 19:44:40 +00:00
Budibase Staging Release Bot 71fcfa1a02 Update pro version to 2.5.6-alpha.29 2023-04-25 16:54:16 +00:00
Budibase Staging Release Bot ca85d48ca6 v2.5.6-alpha.29 2023-04-25 16:52:46 +00:00
mike12345567 19b568891e Merge branch 'develop' of github.com:Budibase/budibase into chore/npmless-builds 2023-04-25 17:44:17 +01:00
Adria Navarro 608a38489f Export undefineds as empty values in csv, instead of empty strings 2023-04-25 12:34:50 +01:00
Dean 72c72fc48a Lint fix 2023-04-25 12:31:52 +01:00
Dean f3be917da1 Enrich the upgradable version property when fetching the app package 2023-04-25 12:16:02 +01:00
Budibase Staging Release Bot 3f22bbf50d Update pro version to 2.5.6-alpha.28 2023-04-25 10:51:34 +00:00
Budibase Staging Release Bot 2d2a368f23 v2.5.6-alpha.28 2023-04-25 10:50:10 +00:00
Budibase Staging Release Bot 5b4b3b6fd1 v2.5.6-alpha.27 2023-04-25 09:11:46 +00:00
Budibase Staging Release Bot c08db11859 Update pro version to 2.5.6-alpha.26 2023-04-24 19:16:43 +00:00
Budibase Staging Release Bot 8804b9f5a2 v2.5.6-alpha.26 2023-04-24 19:15:05 +00:00
adrinr e09e1c8627 Use local pro 2023-04-24 20:01:59 +01:00
adrinr a2746ec241 Cleanups 2023-04-24 20:01:49 +01:00
adrinr dd9d499cc1 Use latest for pro 2023-04-24 20:00:22 +01:00
adrinr 9387d37d3b Use 0.0.1 2023-04-24 20:00:22 +01:00
adrinr ad547f32e2 Add latest back 2023-04-24 20:00:22 +01:00
adrinr 92115c5b95 Remove latest references 2023-04-24 19:59:46 +01:00
adrinr 25bc89a9b6 Remove package versions 2023-04-24 19:58:40 +01:00
Budibase Staging Release Bot 165c6020eb Update pro version to 2.5.6-alpha.25 2023-04-24 18:33:52 +00:00
Budibase Staging Release Bot 9056cd41c7 v2.5.6-alpha.25 2023-04-24 18:31:54 +00:00
Budibase Staging Release Bot dfe28d171c v2.5.6-alpha.24 2023-04-24 17:41:06 +00:00
Adria Navarro 640bb2004b Merge pull request #10324 from Budibase/chore/remove_package.json_dependency
Chore - Remove package.json dependency
2023-04-24 19:34:15 +02:00
adrinr 128802ebf3 Fix build 2023-04-24 18:05:53 +01:00
Budibase Staging Release Bot 88a6cd50dd v2.5.6-alpha.23 2023-04-24 16:58:46 +00:00
Michael Drury 9c93bf91c0 Merge pull request #10352 from Budibase/fix/10349
Allow SQL formulas using related row information to be used as display columns
2023-04-24 17:50:49 +01:00
Budibase Staging Release Bot 19e8836870 v2.5.6-alpha.22 2023-04-24 16:43:56 +00:00
Adria Navarro c47ff6ccfb Merge branch 'develop' into chore/remove_package.json_dependency 2023-04-24 18:42:55 +02:00
Budibase Staging Release Bot 4786ce58ed v2.5.6-alpha.21 2023-04-24 16:01:58 +00:00
Budibase Staging Release Bot 52d9e22fb8 Update pro version to 2.5.6-alpha.20 2023-04-24 12:47:25 +00:00
Budibase Staging Release Bot 9ee56025f1 v2.5.6-alpha.20 2023-04-24 12:45:50 +00:00
Michael Drury 1b3d92ae86 Merge pull request #10369 from Budibase/chore/pro_as_submodule
Chore - use pro as submodule
2023-04-24 13:26:30 +01:00
Budibase Staging Release Bot 053e1eae83 Update pro version to 2.5.6-alpha.19 2023-04-24 11:11:26 +00:00
Budibase Staging Release Bot 360b828e66 v2.5.6-alpha.19 2023-04-24 11:10:02 +00:00
melohagan 5e76a50b0b Add info to query result payload (#10291) 2023-04-24 12:03:02 +01:00
Budibase Staging Release Bot 5f883ec42c Update pro version to 2.5.6-alpha.18 2023-04-24 10:39:51 +00:00
Budibase Staging Release Bot 4a8a6c8bbc v2.5.6-alpha.18 2023-04-24 10:38:25 +00:00
Budibase Release Bot 9eef7acdb3 Update pro version to 2.5.8 2023-04-24 08:50:28 +00:00
Budibase Release Bot 2f2084a426 v2.5.8 2023-04-24 08:47:42 +00:00
Budibase Staging Release Bot 001bd625c1 Update pro version to 2.5.6-alpha.17 2023-04-24 08:47:21 +00:00
Budibase Staging Release Bot 548ba5a07a v2.5.6-alpha.17 2023-04-24 08:45:56 +00:00
Rory Powell ec06f13aa6 Per user pricing (#10378)
* Update pro version to 2.4.44-alpha.9 (#10231)

Co-authored-by: Budibase Staging Release Bot <>

* Track installation and unique tenant id on licence activate (#10146)

* changes and exports

* removing the extend

* Lint + tidy

* Update account.ts

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>

* Type updates for loading new plans (#10245)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS` (#10247)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete + migration (#10250)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Lint

* Types and structures for user subscription quantity sync (#10280)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Prevent old installs from activating, track install info via get license request instead of on activation.

* Add usesInvoicing to PurchasedPlan

* Add min/max users to PurchasedPlan

* Additional test structures for generating a license, remove maxUsers from PurchasedPlan - this is already present in the license quotas

* Stripe integration for monthly prorations on annual plans

* Integrate annual prorations with test clocks

* Updated types, test utils and date processing for licensing (#10346)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Prevent old installs from activating, track install info via get license request instead of on activation.

* Add usesInvoicing to PurchasedPlan

* Add min/max users to PurchasedPlan

* Additional test structures for generating a license, remove maxUsers from PurchasedPlan - this is already present in the license quotas

* Stripe integration for monthly prorations on annual plans

* Integrate annual prorations with test clocks

* Updated types, test utils and date processing

* Lint

* Pricing/billing page (#10353)

* bbui updates for billing page

* Require all PlanTypes in PlanMinimums for compile time safety

* fix test package utils

* Incoming user limits warnings (#10379)

* incoming user limits warning

* fix inlinealert button

* add corretc button link and text to user alert

* pr comments

* simplify limit check

* Types and test updates for subscription quantity changes in account-portal (#10372)

* Add chance extensions for `arrayOf`. Update events spies with license events

* Add generics to doInTenant response

* Update account structure with quota usage

* User count limits (#10385)

* incoming user limits warning

* fix inlinealert button

* add corretc button link and text to user alert

* pr comments

* simplify limit check

* user limit messaging on add users modal

* user limit messaging on import users modal

* update licensing store to be more generic

* some styling updates

* remove console log

* Store tweaks

* Add startDate to Quota type

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>

* Lint

* Support custom lock options

* Reactivity fixes for add user modals

* Update ethereal email creds

* Add warn for getting invite from code error

* Extract disabling user import condition

* Handling unlimited users in modals logic and adding start date processing to store

* Lint

* Integration testing fixes (#10389)

* lint

---------

Co-authored-by: Mateus Badan de Pieri <mateuspieri@gmail.com>
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
Co-authored-by: Peter Clement <PClmnt@users.noreply.github.com>
2023-04-24 09:31:48 +01:00
Budibase Release Bot 9aa6e1e44d Update pro version to 2.5.7 2023-04-21 17:32:17 +00:00
Budibase Release Bot 93f7bd54d8 v2.5.7 2023-04-21 17:29:12 +00:00
Budibase Staging Release Bot 5dd1410a24 Update pro version to 2.5.6-alpha.16 2023-04-21 13:47:04 +00:00
Budibase Staging Release Bot b3d989e249 v2.5.6-alpha.16 2023-04-21 13:45:11 +00:00
Budibase Staging Release Bot 538424a469 Update pro version to 2.5.6-alpha.15 2023-04-21 11:45:04 +00:00
Budibase Staging Release Bot 06e6c20cf1 v2.5.6-alpha.15 2023-04-21 11:43:34 +00:00
Michael Drury 76625cd509 Merge pull request #10363 from Budibase/fix/budi-6900
Removing "export all apps" functionality from cloud
2023-04-21 12:29:07 +01:00
Budibase Staging Release Bot 795ae29428 Update pro version to 2.5.6-alpha.14 2023-04-21 11:26:22 +00:00
Budibase Staging Release Bot c196fc1f3e v2.5.6-alpha.14 2023-04-21 11:24:59 +00:00