Commit Graph

20394 Commits

Author SHA1 Message Date
adrinr 5824b45c20 Remove check for testing 2023-04-24 19:58:40 +01:00
adrinr 1bcb481d69 Change publish process 2023-04-24 19:58:40 +01:00
adrinr 8faed6cfbc Move script 2023-04-24 19:58:40 +01:00
adrinr ca84e0c94c Push changes 2023-04-24 19:58:40 +01:00
adrinr af8a27fa10 Setup git user 2023-04-24 19:58:40 +01:00
adrinr e10eba9447 Remove check 2023-04-24 19:58:40 +01:00
adrinr 6ecb062acf Tag action 2023-04-24 19:58:40 +01:00
adrinr 9ddb148698 Add version file 2023-04-24 19:58:40 +01:00
adrinr 25bc89a9b6 Remove package versions 2023-04-24 19:58:40 +01:00
adrinr 0a83d8eec8 Remove release pro from commands 2023-04-24 19:56:13 +01: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 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
Martin McKeaveney 86dc082f57 Merge pull request #10366 from Budibase/budi-5186-dynamic-filter-contains-option
Dynamic filter contains option
2023-04-24 09:32:58 +01: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
Martin McKeaveney c8136c25da Update README.md 2023-04-21 19:21:51 +01: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
melohagan 476bf65957 Set default enum values (#10377) 2023-04-21 14:37:15 +01: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
mike12345567 72d1394873 Further linting. 2023-04-21 12:07:28 +01:00
mike12345567 c5e1457b25 Merge branch 'develop' of github.com:Budibase/budibase into fix/budi-6900 2023-04-21 12:06:18 +01:00
Michael Drury e92864f57a Merge pull request #10361 from Budibase/dependabot/npm_and_yarn/vm2-3.9.17
Bump vm2 from 3.9.16 to 3.9.17
2023-04-21 12:04:34 +01:00
Michael Drury eb68d8e408 Merge pull request #10375 from Budibase/dependabot/npm_and_yarn/nunjucks-3.2.4
Bump nunjucks from 3.2.3 to 3.2.4
2023-04-21 12:04:10 +01:00
Mel O'Hagan e9c3958e86 Merge branch 'develop' into budi-5186-dynamic-filter-contains-option 2023-04-21 10:46:17 +01:00
dependabot[bot] 5ec8c25414 Bump vm2 from 3.9.16 to 3.9.17
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.16 to 3.9.17.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.16...3.9.17)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-21 07:19:22 +00:00
Budibase Staging Release Bot 6d2eeff03a Update pro version to 2.5.6-alpha.13 2023-04-21 07:18:15 +00:00
Budibase Staging Release Bot 91e7fe8ec1 v2.5.6-alpha.13 2023-04-21 07:16:47 +00:00
Andrew Kingston c201c4af88 Merge pull request #10371 from Budibase/fix/inclusion-constraint
Fix options inclusion constraint regression
2023-04-21 08:09:45 +01:00
dependabot[bot] 15b1cad3fa Bump nunjucks from 3.2.3 to 3.2.4
Bumps [nunjucks](https://github.com/mozilla/nunjucks) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/mozilla/nunjucks/releases)
- [Changelog](https://github.com/mozilla/nunjucks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mozilla/nunjucks/compare/v3.2.3...v3.2.4)

---
updated-dependencies:
- dependency-name: nunjucks
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-20 21:59:51 +00:00
Mel O'Hagan 458b23fc1b Add escape for forward slash 2023-04-20 21:57:48 +01:00
Andrew Kingston aefb48e363 Fix options inclusion constraint regression 2023-04-20 20:10:30 +01:00
adrinr afc5c99c6f Revert "Merge pull request #10367 from Budibase/revert-10267-chore/pro_as_submodule"
This reverts commit df18119b56, reversing
changes made to 676b85dbd8.
2023-04-20 19:48:29 +01:00
Budibase Staging Release Bot 30ba8fbc13 Update pro version to 2.5.6-alpha.12 2023-04-20 18:36:36 +00:00
Budibase Staging Release Bot 269cbc8b2c v2.5.6-alpha.12 2023-04-20 18:35:09 +00:00
Adria Navarro df18119b56 Merge pull request #10367 from Budibase/revert-10267-chore/pro_as_submodule
Revert "Configure budibase-pro as a submodule"
2023-04-20 20:26:56 +02:00
adrinr 7c3f5e79d6 Bump version manually 2023-04-20 19:12:51 +01:00
adrinr e65225996e Revert https://github.com/Budibase/budibase/pull/10267 2023-04-20 19:04:20 +01:00
Mel O'Hagan 66a573dcc9 Fix fuzzy search internal DB 2023-04-20 18:14:41 +01:00
Mel O'Hagan 68ba2402a0 Fix substring regex 2023-04-20 17:51:58 +01:00
mike12345567 2056623897 Fixing linting. 2023-04-20 17:51:43 +01:00