1
0
Fork 0
mirror of synced 2024-08-15 01:51:33 +12:00
Commit graph

4414 commits

Author SHA1 Message Date
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
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
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 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
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
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
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
adrinr
e65225996e Revert https://github.com/Budibase/budibase/pull/10267 2023-04-20 19:04:20 +01:00
Adria Navarro
22d42afe8f Merge pull request #10267 from Budibase/chore/pro_as_submodule
Chore - use pro as submodule
2023-04-19 18:23:28 +02:00
Budibase Staging Release Bot
ef852851df Update pro version to 2.5.6-alpha.6 2023-04-19 13:31:04 +00:00
Budibase Staging Release Bot
34b3781b59 v2.5.6-alpha.6 2023-04-19 13:29:39 +00:00
adrinr
98b372965c Merge branch 'develop' into chore/pro_as_submodule 2023-04-19 10:22:48 +01:00
Budibase Staging Release Bot
1e4e61772b Update pro version to 2.5.6-alpha.5 2023-04-18 16:42:01 +00:00
Budibase Staging Release Bot
06ec04dcec v2.5.6-alpha.5 2023-04-18 16:40:23 +00:00
Budibase Staging Release Bot
89f8515257 Update pro version to 2.5.6-alpha.4 2023-04-18 13:46:13 +00:00
Budibase Staging Release Bot
a13cdefd01 v2.5.6-alpha.4 2023-04-18 13:44:25 +00:00
adrinr
37158594f7 Merge branch 'develop' into chore/pro_as_submodule 2023-04-18 12:21:38 +01:00
Budibase Staging Release Bot
af233b8fb3 Update pro version to 2.5.6-alpha.3 2023-04-18 09:45:43 +00:00
Budibase Staging Release Bot
287ba01691 v2.5.6-alpha.3 2023-04-18 09:44:21 +00:00
Budibase Staging Release Bot
a8f8840854 Update pro version to 2.5.6-alpha.2 2023-04-17 16:57:29 +00:00
Budibase Staging Release Bot
443319f4a5 v2.5.6-alpha.2 2023-04-17 16:55:49 +00:00
adrinr
1dcb6b32b2 Remove not required references 2023-04-17 15:54:13 +01:00
mike12345567
b6f14a3f55 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-17 14:58:40 +01:00
adrinr
eeb0daa98a Update builds to exclude the package.json 2023-04-17 14:20:36 +01:00
Budibase Staging Release Bot
acab893fc0 Update pro version to 2.5.6-alpha.1 2023-04-17 11:34:41 +00:00
Budibase Staging Release Bot
b62633587f v2.5.6-alpha.1 2023-04-17 11:33:21 +00:00
adrinr
16b802b7f6 v2.5.6-alpha.0 2023-04-17 12:26:26 +01:00
Budibase Staging Release Bot
3b0d854af0 Update pro version to 2.5.5-alpha.4 2023-04-17 10:52:36 +00:00
Budibase Staging Release Bot
b81be5d686 v2.5.5-alpha.4 2023-04-17 10:51:12 +00:00
Adria Navarro
6ee0702316 Merge pull request #10323 from Budibase/chore/remove_old_zlib_ref
Chore - Remove zlib npm references
2023-04-17 12:38:19 +02:00
Budibase Staging Release Bot
f9c5fd489b v2.5.5-alpha.3 2023-04-17 10:30:38 +00:00
adrinr
33c3b67f8c Merge branch 'develop' into chore/remove_old_zlib_ref 2023-04-17 11:28:43 +01:00
Budibase Staging Release Bot
c1d85bc8b0 Update pro version to 2.5.5-alpha.2 2023-04-17 09:35:44 +00:00
Budibase Staging Release Bot
457e1d7a1a v2.5.5-alpha.2 2023-04-17 09:34:23 +00:00
adrinr
ac4e45a433 Replace usages 2023-04-17 10:27:37 +01:00
mike12345567
d506ef52f8 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-17 10:16:15 +01:00
Budibase Staging Release Bot
4755dd6120 Update pro version to 2.5.5-alpha.1 2023-04-17 09:03:01 +00:00
Budibase Staging Release Bot
e60b09b03e v2.5.5-alpha.1 2023-04-17 09:01:24 +00:00
Adria Navarro
b5175884c7 Merge pull request #10310 from Budibase/budi-6855-allow-editing-group-display-names
BUDI-6855 - Allow editing group display names
2023-04-17 10:51:41 +02:00
Michael Drury
941947f04c Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-14 22:42:02 +01:00
Budibase Staging Release Bot
b1b5dae881 Update pro version to 2.5.5-alpha.0 2023-04-14 16:47:22 +00:00
Budibase Staging Release Bot
8e87a5e700 v2.5.5-alpha.0 2023-04-14 16:45:33 +00:00
mike12345567
b36702ca72 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-04-14 17:32:04 +01:00
adrinr
7bd4c39929 Fix jest when no pro access 2023-04-14 17:18:15 +01:00
adrinr
c83cf33707 Test get group without members 2023-04-14 15:14:41 +01:00
adrinr
f3e6295892 Add tests 2023-04-14 14:50:44 +01:00
adrinr
ce2a610c00 Test exclude members 2023-04-14 14:48:48 +01:00
adrinr
1301b23f02 Add group filter fetch 2023-04-14 14:36:06 +01:00
Budibase Staging Release Bot
07f29bd8ba Update pro version to 2.4.44-alpha.32 2023-04-14 13:17:24 +00:00
Budibase Staging Release Bot
59a6a6807f v2.4.44-alpha.32 2023-04-14 13:15:49 +00:00
Budibase Staging Release Bot
c10015548e Update pro version to 2.4.44-alpha.31 2023-04-14 13:05:48 +00:00
Budibase Staging Release Bot
361a1a02b1 v2.4.44-alpha.31 2023-04-14 13:04:19 +00:00
adrinr
cb3698a577 v2.4.44-alpha.30 2023-04-14 13:49:13 +01:00
adrinr
f6f131399d v2.4.44-alpha.29 2023-04-14 13:48:05 +01:00
adrinr
d0a0ea4944 v2.4.44-alpha.28 2023-04-14 13:47:35 +01:00
Budibase Staging Release Bot
c77c7ff6f5 Update pro version to 2.4.44-alpha.27 2023-04-14 12:14:31 +00:00
Budibase Staging Release Bot
e8c161aa63 v2.4.44-alpha.27 2023-04-14 12:13:01 +00:00
Budibase Staging Release Bot
f3e9790a6e Update pro version to 2.4.44-alpha.26 2023-04-14 11:36:19 +00:00
Budibase Staging Release Bot
e8e704259e v2.4.44-alpha.26 2023-04-14 11:34:48 +00:00
Budibase Staging Release Bot
d9e2ea1272 Update pro version to 2.4.44-alpha.25 2023-04-14 11:19:39 +00:00
Budibase Staging Release Bot
9f4a340927 v2.4.44-alpha.25 2023-04-14 11:18:12 +00:00
adrinr
1a26877f08 v2.4.44-alpha.24 2023-04-14 12:10:49 +01:00
Budibase Staging Release Bot
b81804b905 Update pro version to 2.4.44-alpha.23 2023-04-14 11:05:30 +00:00
Budibase Staging Release Bot
788b7b6492 v2.4.44-alpha.23 2023-04-14 11:03:56 +00:00
Budibase Staging Release Bot
1116c63ed4 Update pro version to 2.4.44-alpha.22 2023-04-14 10:19:12 +00:00
Budibase Staging Release Bot
fc971ed3ad v2.4.44-alpha.22 2023-04-14 10:17:37 +00:00
Budibase Release Bot
dc3d0e5e98 Update pro version to 2.5.4 2023-04-14 09:08:57 +00:00
Budibase Release Bot
52aa5f1a66 v2.5.4 2023-04-14 09:05:38 +00:00
Budibase Staging Release Bot
a529556e07 v2.4.44-alpha.21 2023-04-13 18:55:33 +00:00
adrinr
0aa5b3da03 Merge branch 'develop' into chore/yarn_workspaces 2023-04-13 19:29:45 +01:00
Budibase Staging Release Bot
f6d54c7196 Update pro version to 2.4.44-alpha.20 2023-04-13 12:42:24 +00:00
Budibase Staging Release Bot
c9ffbe46e1 v2.4.44-alpha.20 2023-04-13 12:39:28 +00:00
adrinr
f585bb793d Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule 2023-04-13 10:59:52 +01:00
adrinr
36c412e57b Remove unused yarn.lock 2023-04-13 10:54:35 +01:00
Budibase Staging Release Bot
fd1c27aa22 Update pro version to 2.4.44-alpha.19 2023-04-13 09:30:19 +00:00
Budibase Staging Release Bot
a89b04203e v2.4.44-alpha.19 2023-04-13 09:27:17 +00:00
Michael Drury
6ff60cb74f Merge pull request #10283 from Budibase/dependabot/npm_and_yarn/packages/worker/vm2-3.9.16
Bump vm2 from 3.9.14 to 3.9.16 in /packages/worker
2023-04-13 10:11:49 +01:00
adrinr
b8d9311b49 Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule 2023-04-13 09:41:59 +01:00
Budibase Staging Release Bot
50034e9093 Update pro version to 2.4.44-alpha.18 2023-04-12 21:30:30 +00:00
Budibase Staging Release Bot
1e9ae6aec1 v2.4.44-alpha.18 2023-04-12 21:27:37 +00:00
dependabot[bot]
c85da05f12 Bump vm2 from 3.9.14 to 3.9.16 in /packages/worker
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.14 to 3.9.16.
- [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.14...3.9.16)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-12 21:11:11 +00:00
adrinr
e6dc4e5fa0 Remove unused yarn.lock 2023-04-12 18:49:29 +01:00
adrinr
77a96b41a0 Undo yarn.lock changes 2023-04-12 17:41:49 +01:00
Budibase Staging Release Bot
222e772cb7 Update pro version to 2.4.44-alpha.17 2023-04-12 15:41:28 +00:00
Budibase Staging Release Bot
4eb5201f6a v2.4.44-alpha.17 2023-04-12 15:38:04 +00:00
Budibase Staging Release Bot
201c886f5a Update pro version to 2.4.44-alpha.16 2023-04-12 13:10:35 +00:00
Budibase Staging Release Bot
9afbb300fa v2.4.44-alpha.16 2023-04-12 13:07:38 +00:00
Budibase Staging Release Bot
cc929b93a9 Update pro version to 2.4.44-alpha.15 2023-04-12 12:45:51 +00:00
Budibase Staging Release Bot
ad393a829d v2.4.44-alpha.15 2023-04-12 12:42:23 +00:00
Budibase Staging Release Bot
48a7d454b5 Update pro version to 2.4.44-alpha.14 2023-04-12 11:01:52 +00:00