1
0
Fork 0
mirror of synced 2024-07-14 18:55:45 +12:00
Commit graph

4645 commits

Author SHA1 Message Date
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
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
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
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 de51364303 Some updates to Dockerfiles. 2023-04-27 17:00:15 +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
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
Rory Powell 972e2257b7 [draft] Pricing/fixes (#10424)
* Fix qa core suite

* Update package.json

* Lint

* Handle conflict on account metadata

* Fix issue adding users via csv import when on paid plan

* Fix user invites

* Lint
2023-04-27 08:25:53 +01:00
mike12345567 5066d20c9d Updating Dockerfiles and dockerignore to clear out any un-needed assets. 2023-04-26 17:59:18 +01: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
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
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
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
Rory Powell aee52af7f0 Add feature and quota overrides to qa core for cloud tests (#10417)
* Fix qa core suite

* Update package.json

* Lint
2023-04-25 20:36:27 +01: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
mike12345567 49b45f5e67 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-25 17:37:56 +01:00
mike12345567 ebb599e023 Removing units. 2023-04-25 15:22:15 +01:00
mike12345567 5d0fa664f9 Quick attempt at fix for #10274 - some email clients don't respect width, add both height and width. 2023-04-25 15:20:25 +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
Budibase Staging Release Bot 88a6cd50dd v2.5.6-alpha.23 2023-04-24 16:58:46 +00: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
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
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
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
adrinr e65225996e Revert https://github.com/Budibase/budibase/pull/10267 2023-04-20 19:04:20 +01:00
Budibase Release Bot cb0f321261 Update pro version to 2.5.6 2023-04-20 14:33:28 +00:00
Budibase Release Bot 5a9c7d83b1 v2.5.6 2023-04-20 14:30:34 +00:00
Michael Drury 1bd1857533 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-20 11:35:29 +01:00
Budibase Release Bot d21f8435d6 Update pro version to 2.5.5 2023-04-20 08:55:19 +00:00
Budibase Release Bot 5c292bbecd v2.5.5 2023-04-20 08:51:41 +00: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
mike12345567 67de033683 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-19 15:01:26 +01: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
mike12345567 9a36377d6e Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-17 18:10:29 +01: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
mike12345567 af72b730e0 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-14 13:06:57 +01: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
mike12345567 361005b521 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-13 17:23:58 +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
Budibase Staging Release Bot f65a308ffd v2.4.44-alpha.14 2023-04-12 10:58:55 +00:00
Budibase Staging Release Bot 1d7ba831ca Update pro version to 2.4.44-alpha.13 2023-04-12 09:10:56 +00:00
Budibase Staging Release Bot a4e2c41c1c v2.4.44-alpha.13 2023-04-12 09:07:40 +00:00
adrinr c82fb0ad58 Change type references 2023-04-11 17:00:47 +01:00
adrinr 000e49a229 Bootstrap using submodule 2023-04-11 16:53:51 +01:00
adrinr 859b10c4be Change references on jest 2023-04-11 16:51:50 +01:00
adrinr f882993091 Name and its fields are optional 2023-04-11 16:12:18 +01:00
Budibase Release Bot 471bb82f7b Update pro version to 2.5.3 2023-04-11 13:49:55 +00:00
Budibase Release Bot fb268f1655 v2.5.3 2023-04-11 13:46:26 +00:00
Budibase Staging Release Bot 2e60ca7526 Update pro version to 2.4.44-alpha.12 2023-04-11 13:46:00 +00:00
Budibase Staging Release Bot 08dbee5384 v2.4.44-alpha.12 2023-04-11 13:42:48 +00:00
adrinr c77ed3d737 Renames 2023-04-11 13:39:13 +01:00
adrinr 56567de04a Fix tests 2023-04-11 13:39:13 +01:00
adrinr e1279ffecd Use proper errors instead of string throwing 2023-04-11 13:39:13 +01:00
adrinr 57a3ff96ea Add new test for conflicting user email 2023-04-11 13:39:13 +01:00
Budibase Staging Release Bot 0acb821b70 Update pro version to 2.4.44-alpha.11 2023-04-11 12:31:40 +00:00
Budibase Staging Release Bot 6aefc6b643 v2.4.44-alpha.11 2023-04-11 12:28:43 +00:00
Adria Navarro 37b56b8084 Merge pull request #10253 from Budibase/handle_removing_users
BUDI-6838 - Remove users on deactivation - Amend tests
2023-04-11 14:21:08 +02:00
Budibase Staging Release Bot 069fb64245 Update pro version to 2.4.44-alpha.10 2023-04-10 18:55:59 +00:00
Budibase Staging Release Bot a3c0510ed7 v2.4.44-alpha.10 2023-04-10 18:53:08 +00:00
adrinr 122db55dce Fix tests 2023-04-10 18:47:22 +01:00
Budibase Release Bot 7d63586c8c Update pro version to 2.5.2 2023-04-07 21:33:30 +00:00
Budibase Release Bot 1b0635e957 v2.5.2 2023-04-07 21:30:39 +00:00
Martin McKeaveney 3b32120f83 bumping worker leaf version 2023-04-07 22:06:19 +01:00
mike12345567 0803b08217 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-05 17:59:18 +01:00
Budibase Staging Release Bot 6396548064 Update pro version to 2.4.44-alpha.9 2023-04-05 14:44:51 +00:00
Budibase Staging Release Bot efa1ea7b1b v2.4.44-alpha.9 2023-04-05 14:41:48 +00:00
Rory Powell 77ffb8d86d Run integration suite in CI again / auto detect tenancy / refactors (#10209)
* qa-core-ci-fixes

* global setup and teardown wip

* Updates to logs and setup

* Remove date and console mocking

* Update CI to spin up minimal dev env

* Update readme

* Fix scopeBackend.sh

* Ensure docker services are initialised before starting worker

* Lint

* Fix admin user being created on startup (#10219)

* use regular bootstrap and build

* Lint

* Temp: re-use global setup to get around app limit in QA
2023-04-05 15:33:56 +01:00
Budibase Staging Release Bot 18ccf134b9 Update pro version to 2.4.44-alpha.8 2023-04-05 12:21:27 +00:00
Budibase Staging Release Bot f02f996744 v2.4.44-alpha.8 2023-04-05 12:18:30 +00:00
Budibase Staging Release Bot 1785fd8300 Update pro version to 2.4.44-alpha.7 2023-04-04 14:56:03 +00:00
Budibase Staging Release Bot 244b911efb v2.4.44-alpha.7 2023-04-04 14:53:06 +00:00
Budibase Staging Release Bot bcf5bb9ca0 Update pro version to 2.4.44-alpha.6 2023-04-04 14:21:08 +00:00
Budibase Staging Release Bot e94a05887f v2.4.44-alpha.6 2023-04-04 14:18:08 +00:00
Rory Powell 976b3a55ca Update logging to support dd trace attributes (#10086)
* Update logging middleware to integrate with pino for console logging

* Remove elastic apm references, use updated core middlewares

* Remove redundant LOG_LEVEL definitions

* Remove no longer needed jest logging overrides

* lint

* Backwards compat between console log helpers and pino

* Configurable DISABLE_HTTP_LOGGING

* Don't log 4xx as errors

* Remove redundant ENABLE_4XX_HTTP_LOGGING

* Cleanup migrations and event logging

* Improve bb-alert logging

* Add DISABLE_HTTP_LOGGING to helm chart

* Add ops endpoints for testing

* Disable http logging in dev

* Backwards compatible tracing implementation

* Naming update on http logging env var

* lint

* Update packages/backend-core/src/environment.ts

Co-authored-by: Adria Navarro <adria@revityapp.com>

* Merge

* Lint

* Fix console.warn failing mock by replacing with alerts mock instead

* Lint

---------

Co-authored-by: Adria Navarro <adria@revityapp.com>
2023-04-04 15:08:46 +01:00
mike12345567 a2cabb01d5 Removing user app sync calls from worker - no longer required. 2023-04-04 13:53:30 +01:00
Budibase Release Bot b1325e4742 Update pro version to 2.5.1 2023-04-04 09:27:35 +00:00
Budibase Release Bot 917c5100ad v2.5.1 2023-04-04 09:24:27 +00:00
Rory Powell 5eecb6e686 Remove loop for get account during user bulk import (#10203) 2023-04-04 10:14:20 +01:00
Budibase Staging Release Bot 149aa9bbd2 Update pro version to 2.4.44-alpha.5 2023-04-04 09:12:51 +00:00
Budibase Staging Release Bot 7bc049c02b v2.4.44-alpha.5 2023-04-04 09:09:48 +00:00
Adria Navarro e3f8612b37 Merge pull request #10201 from Budibase/budi-6822-allow-ad-users-without-emails-set
BUDI-6822 - Allow AD users without emails set
2023-04-04 10:57:53 +02:00
adrinr 6862a2d26b Downgrade python 2023-04-04 08:44:05 +01:00
adrinr 2b89b3fb15 Update pino-pretty versions 2023-04-04 08:44:05 +01:00
adrinr e0bcc42c80 Make scim info extensible and the object unaware of the data 2023-04-03 19:06:03 +01:00
Budibase Staging Release Bot b841cec4c9 Update pro version to 2.4.44-alpha.4 2023-04-03 15:16:50 +00:00
Budibase Staging Release Bot 2c9b354a1b v2.4.44-alpha.4 2023-04-03 15:13:42 +00:00
Budibase Release Bot fbbb36b809 Update pro version to 2.5.0 2023-04-03 13:14:16 +00:00
Budibase Release Bot be8dfd2ef1 v2.5.0 2023-04-03 13:10:52 +00:00
Budibase Staging Release Bot 5172c45ce8 Update pro version to 2.4.44-alpha.3 2023-04-03 11:37:14 +00:00
Budibase Staging Release Bot 52cc24121e v2.4.44-alpha.3 2023-04-03 11:33:44 +00:00
Adria Navarro e1669c8260 Merge pull request #10022 from Budibase/feature/scim
Feature - SCIM endpoints
2023-04-03 13:22:01 +02:00
Budibase Staging Release Bot 4a2e1b8019 Update pro version to 2.4.44-alpha.2 2023-04-03 11:12:19 +00:00
Budibase Staging Release Bot 1c84b14582 v2.4.44-alpha.2 2023-04-03 11:09:04 +00:00
Budibase Release Bot d68930ee61 Update pro version to 2.4.44 2023-04-02 18:18:15 +00:00
Budibase Release Bot 051d39690a v2.4.44 2023-04-02 18:15:15 +00:00
Budibase Staging Release Bot 94b280ab8e Update pro version to 2.4.44-alpha.1 2023-03-31 23:04:58 +00:00
Budibase Staging Release Bot 97cfcb6b93 v2.4.44-alpha.1 2023-03-31 23:01:55 +00:00
Budibase Staging Release Bot 2ac6d7679a Update pro version to 2.4.44-alpha.0 2023-03-31 22:40:47 +00:00
Budibase Staging Release Bot 5e3cf7af1b v2.4.44-alpha.0 2023-03-31 22:37:36 +00:00
Rory Powell e9322be28f Merge branch 'develop' into merge-master-develop 2023-03-31 12:39:22 +01:00
adrinr 5b0a0f44f5 Use node zlib 2023-03-31 12:33:32 +01:00
adrinr babf63f194 Fix build 2023-03-31 12:33:32 +01:00
adrinr 87aaf3b172 Use esbuild for worker 2023-03-31 12:32:41 +01:00
Budibase Staging Release Bot 99bea8e7ce v2.4.42-alpha.7 2023-03-31 11:31:30 +00:00
Rory Powell 44aa19a99a Merge branch 'master' into merge-master-develop 2023-03-31 12:26:04 +01:00
Budibase Staging Release Bot 175cbaf4b0 Update pro version to 2.4.42-alpha.6 2023-03-31 11:11:39 +00:00
Budibase Staging Release Bot 9c8fcacf2a v2.4.42-alpha.6 2023-03-31 11:08:33 +00:00
Budibase Staging Release Bot a999a43406 Update pro version to 2.4.42-alpha.5 2023-03-31 10:46:08 +00:00
Budibase Staging Release Bot 889ea356e6 v2.4.42-alpha.5 2023-03-31 10:43:16 +00:00
Budibase Release Bot 78f76ca0df Update pro version to 2.4.43 2023-03-31 09:46:24 +00:00
Budibase Release Bot 2118bcea3a v2.4.43 2023-03-31 09:42:50 +00:00
Rory Powell 79bec7d86d Add force exit, -e flag and streaming to tests (#10151)
* Add force exit, -e flag and streaming to tests

* Temp remove script usage from worker tests

* Revert "Temp remove script usage from worker tests"

This reverts commit 5e0ed2e92d.

* Always fail test

* Ignore server test package from coverage report

* Unscope server only

* Run all server tests again

* Update backend core test script to fail when any command fails and force exit

* Don't try to require client in test

* Port memory limit fix from develop

* Remove always failing test and commented out block for client require

* Fixing some issues with test cases.

* Revert assertions in internalSearch.spec.js

---------

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
2023-03-31 10:32:13 +01:00