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

4819 commits

Author SHA1 Message Date
mike12345567
eefac0fe08 Quick updates based on latest lerna version, as well as some fixes after running through flows (post refactoring). 2023-07-26 18:13:18 +01:00
mike12345567
64a5426d36 Updates to remove app builder concept, denying access to app creation for app builders. 2023-07-26 17:32:21 +01:00
mike12345567
c277b065db Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-26 14:40:17 +01:00
mike12345567
8253ad0a2e Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-26 14:24:29 +01:00
Adria Navarro
de0f3f7463 Merge branch 'develop' into backmerge-master-20230726 2023-07-26 12:50:52 +01:00
Adria Navarro
2e54b40d55 Build backend-core before dev script 2023-07-26 12:48:33 +02:00
mike12345567
43bfb943a3 Some fixes post testing. 2023-07-25 18:52:59 +01:00
mike12345567
66fbdfe4e8 Breaking out pro components back into the worker user SDK, and attempting to separate the pro components as much as possible from the user SDK itself, so that it can be easily re-created in other services. 2023-07-25 18:39:40 +01:00
mike12345567
90371b9d69 Refactoring users core to move into backend, allowing app builder endpoints to move into pro. 2023-07-25 17:48:57 +01:00
Rory Powell
8590f865b5 Merge branch 'master' into merge-master 2023-07-25 15:32:16 +01:00
Rory Powell
a477feaada Lint 2023-07-25 14:14:24 +01:00
Rory Powell
143e6597db Fix issues with tests when running with pro from npm 2023-07-25 13:18:56 +01:00
mike12345567
d9c8e26f65 Re-writing APIs based on most recent discussion about RBAC and per app builders. 2023-07-24 18:29:46 +01:00
mike12345567
c375f860ba Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-24 13:46:49 +01:00
Rory Powell
5c4d29e349 Merge branch 'develop' into feature/offline-license 2023-07-24 10:06:04 +01:00
mike12345567
87d80e08f5 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-21 17:34:27 +01:00
Rory Powell
797f281f6d OpenAPI 3.0 docs for offline license and license key endpoints 2023-07-20 21:24:40 +01:00
Rory Powell
55efb6e618 fix pro mock 2023-07-20 21:24:40 +01:00
Rory Powell
c8fc67d230 Lint 2023-07-20 21:24:19 +01:00
Rory Powell
34d9f1c4f8 Request / response renames 2023-07-20 21:22:54 +01:00
Rory Powell
90e869dc04 /api/global/license/offline/identifier API 2023-07-20 21:21:39 +01:00
Rory Powell
c0568b9153 api / license.spec.ts updates 2023-07-20 21:21:39 +01:00
Rory Powell
20c87b44b1 Allow pro to be mocked in worker 2023-07-20 21:21:39 +01:00
Rory Powell
6c3d01375b Move license keys to their own module 2023-07-20 21:21:39 +01:00
Rory Powell
7c18a7a443 db / licenseInfo.spec.ts 2023-07-20 21:21:39 +01:00
Rory Powell
8e2a551a15 Be more explicit about offline license vs offline license token 2023-07-20 21:21:39 +01:00
Rory Powell
0e80766125 Update license endpoints to provide consistent pattern for offline license and license key (create, read, delete) 2023-07-20 21:21:39 +01:00
Rory Powell
6aeb31c355 Move OFFLINE_MODE to backend-core environment 2023-07-20 21:21:39 +01:00
Rory Powell
5ac024a655 Merge branch 'develop' into feature/offline-license 2023-07-20 12:27:04 +01:00
mike12345567
85dea47a31 Moving user admin/builder functions to shared-core for frontend to use. 2023-07-19 16:19:34 +01:00
mike12345567
39746e0bf0 Main body of work to handle the new approach of per app builders support. 2023-07-18 16:57:48 +01:00
Andrew Kingston
cd8414e6a1 Fix getting started checklist links 2023-07-18 16:14:59 +01:00
mike12345567
e30509c4f9 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-18 11:32:38 +01:00
Adria Navarro
2698e47ec4 Type internal db.get 2023-07-18 11:41:51 +02:00
Rory Powell
22b2edb2bf OpenAPI 3.0 docs for offline license and license key endpoints 2023-07-17 20:55:26 +01:00
mike12345567
a04443c059 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-17 18:06:04 +01:00
Rory Powell
31422cd3ec fix pro mock 2023-07-14 20:56:50 +01:00
Rory Powell
4a38d55ce8 Lint 2023-07-14 16:55:48 +01:00
Adria Navarro
6e2a8e0ab9 Rename .log extensions 2023-07-11 13:09:51 +02:00
Adria Navarro
0b5717cde5 Renamings 2023-07-11 10:44:10 +02:00
Adria Navarro
fd0018c1bc Download logs section 2023-07-11 10:44:10 +02:00
Adria Navarro
b64ea43d20 System logs only for self hosted 2023-07-11 10:44:10 +02:00
Adria Navarro
bb28d09eab Add logs endpoint 2023-07-11 10:44:09 +02:00
Rory Powell
7c4fe15781 Request / response renames 2023-07-10 16:12:19 +01:00
Rory Powell
574c361f6b /api/global/license/offline/identifier API 2023-07-08 13:07:10 +01:00
Rory Powell
7831579e98 api / license.spec.ts updates 2023-07-07 21:15:40 +01:00
Rory Powell
19d3e12177 Allow pro to be mocked in worker 2023-07-07 16:55:11 +01:00
Rory Powell
1fa5cd519c Move license keys to their own module 2023-07-07 11:48:12 +01:00
Rory Powell
700d8131d1 db / licenseInfo.spec.ts 2023-07-07 11:34:10 +01:00
Rory Powell
d02f474fd1 Be more explicit about offline license vs offline license token 2023-07-06 21:26:46 +01:00
Rory Powell
efe53bb217 Update license endpoints to provide consistent pattern for offline license and license key (create, read, delete) 2023-07-06 20:46:25 +01:00
Rory Powell
586bca16d0 Move OFFLINE_MODE to backend-core environment 2023-07-06 20:44:48 +01:00
mike12345567
6d24a30d91 Basic refactor work, the types required for the new API endpoints. 2023-07-05 18:28:04 +01:00
Adria Navarro
f2d41addbd Unify prettier 2023-06-28 14:33:51 +01:00
Michael Drury
f7cdf5f2bc Merge pull request #11001 from Budibase/feature/custom-role-readable-ids
Custom roles - readable IDs
2023-06-27 16:17:08 +01:00
Dean
eaecd3ab68 Merge remote-tracking branch 'origin/develop' into merge-master 2023-06-27 09:31:35 +01:00
mike12345567
8882801315 Fixing lookup of custom role by ID in test case. 2023-06-26 17:01:50 +01:00
Dean
8f9a1d4bba PR feedback 2023-06-26 10:23:57 +01:00
Dean
10108fb543 Null checking logo configs 2023-06-26 10:22:03 +01:00
Dean
6f24772f49 PR Feedback 2023-06-23 16:40:40 +01:00
Dean
ceecd85d76 OIDC icon fix recreated on a new branch 2023-06-23 14:47:58 +01:00
Adria Navarro
2f548d834f Merge branch 'develop' into chore/refactor_pro_as_package 2023-06-23 10:43:57 +01:00
mike12345567
38be94fa07 Fix for test case. 2023-06-20 12:36:05 +01:00
Adria Navarro
50d082c385 Merge branch 'develop' into chore/refactor_pro_as_package 2023-06-20 11:14:05 +01:00
mike12345567
3955b00bbc Merge branch 'develop' of github.com:Budibase/budibase into fix/airgap-templates-call 2023-06-19 18:57:17 +01:00
Michael Drury
c5270ee323 Merge pull request #10959 from Budibase/fix/integration-tests
Integration test updates and improved logging
2023-06-19 18:52:24 +01:00
Adria Navarro
acfe69a3d5 Remove the doble deep format references 2023-06-19 18:34:51 +01:00
mike12345567
289a75fc9a Few minor updates to the integration suite to make it easier to decipher what is happening under the hood, as well as making it easier to log from these (where there is no pino logging available, importing backend-core breaks things). Also added a new script which can be used to get local environment setup as needed to run qa-core tests. Finally, xdescribe for the failing test until can work out what is wrong with MongoDB installation in QA environment. 2023-06-19 18:28:38 +01:00
Adria Navarro
fe3b3aaf53 Fix dependencies 2023-06-19 17:55:47 +01:00
Martin McKeaveney
7c49dd716c remove console log 2023-06-15 15:29:29 +01:00
Martin McKeaveney
dd8e54c5e1 update airgap script and enable support for offline mode 2023-06-15 15:20:14 +01:00
melohagan
c0578d4cc2 Send meeting invite via automation email smtp (#10787)
* Pass calendar props into sendSmtpEmail

* Add calendar event to message

* Add Checkbox and DatePicker automation field UI

* Add URL prop

* Add url to sendSmtpEmail unit test

* Refactor

* Code review comments

* Make location optional

* Add EmailInvite type

---------

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
2023-06-08 14:25:35 +01:00
mike12345567
e07dfab98c Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-07 18:05:29 +01:00
mike12345567
b2a21addc3 Updating release workflows to use a script instead of repeating and adding scripts for updating and resetting dependencies if attempting to build packages locally. 2023-06-07 17:18:59 +01:00
Adria Navarro
d8fc37a760 Revert "Merge pull request #10808 from Budibase/undo_wrong_merge_from_develop"
This reverts commit 4ccc98103c, reversing
changes made to 500424c651.
2023-06-07 14:08:47 +01:00
Adria Navarro
d21274ef2b Remove frozen-lockfile from dockerfiles 2023-06-07 09:05:34 +01:00
Adria Navarro
deeba8bae3 Revert "Merge branch 'develop' into master"
This reverts commit 6f29c978e0, reversing
changes made to 1c6ff73c19.
2023-06-06 22:06:34 +01:00
Adria Navarro
fe9a220717 Add yarn.lock 2023-06-06 14:45:20 +01:00
Adria Navarro
12b69dc37d Remove --configuration=production 2023-06-06 14:45:20 +01:00
Adria Navarro
3a6a3eb8a5 Store tokens in cache and amend redirect 2023-06-06 11:29:49 +01:00
Dean
0a7669ad2d PR feedback 2023-06-05 16:26:27 +01:00
Dean
f20653d4ca Branding fixes 2023-06-05 15:20:04 +01:00
Rory Powell
e00eb171be WIP logo url fixes 2023-06-05 14:01:46 +01:00
Michael Drury
adbdaf394a Small update to make sure that save/patch calls to the rows API (all DS+) return the squashed relationships, not the whole structure. 2023-06-01 18:18:12 +01:00
Adria Navarro
e3ce16d0c9 Update local versions to 0.0.0 2023-05-29 10:54:10 +02:00
Adria Navarro
baeb465a95 Fix dockerfile 2023-05-26 14:02:03 +02:00
Adria Navarro
296de6b1b8 Fix dockerfile 2023-05-26 14:01:35 +02:00
Adria Navarro
7a439b8e01 Remove nx/esbuild refs 2023-05-26 13:59:50 +02:00
Adria Navarro
489ca561b7 Check types 2023-05-26 13:54:10 +02:00
Adria Navarro
099f6fe311 Build worker using build script 2023-05-26 13:53:37 +02:00
Adria Navarro
35d5df7ef0 Use local refs 2023-05-26 10:10:55 +02:00
Martin McKeaveney
8061c700c6 Merge pull request #10425 from Budibase/feature/chatgpt-automationblock
Feature/chatgpt automationblock
2023-05-25 13:39:57 +01:00
Adria Navarro
73f99b99d2 Adding conflicting externals 2023-05-25 14:25:50 +02:00
Adria Navarro
429dc8f6d2 Tidy up tsconfigs 2023-05-25 11:49:18 +02:00
Martin McKeaveney
77c2e309dd merge 2023-05-24 17:35:04 +01:00
mike12345567
733e724eb3 PR comments. 2023-05-24 16:38:24 +01:00
Adria Navarro
0c7b58523a More nx config 2023-05-24 13:08:39 +02:00
Martin McKeaveney
bbab2a9adc merge 2023-05-24 11:25:49 +01:00
Adria Navarro
71a713c688 Add missing nx scripts 2023-05-24 11:51:55 +02:00
Adria Navarro
1be822398f Undo run in band 2023-05-23 12:46:24 +02:00
Adria Navarro
d1ce04736e Addressing PR comments 2023-05-23 11:54:10 +02:00
Adria Navarro
8b912dc8ed Build all 2023-05-23 11:46:20 +02:00
Adria Navarro
931458094b Rename 2023-05-23 11:43:57 +02:00
Adria Navarro
9f9c2d66e0 Remove runinband for actions 2023-05-22 17:02:44 +02:00
Adria Navarro
73372d5f5d Optimise builds 2023-05-22 12:42:14 +02:00
Adria Navarro
a174804aec Do not build sourcemap on pro 2023-05-22 12:33:10 +02:00
Adria Navarro
dd58d6ed76 Optimise check types 2023-05-22 12:31:49 +02:00
Adria Navarro
5fd32618be Fix sourcemaps 2023-05-22 12:06:52 +02:00
Adria Navarro
a24c4eb320 Generate package.json 2023-05-22 11:56:41 +02:00
Adria Navarro
2ce968fcfc Rename file to .js 2023-05-22 11:32:44 +02:00
Adria Navarro
07e0f189bb Fix docker run 2023-05-19 19:56:19 +02:00
Adria Navarro
040d5f2dcb Copy dist to dist 2023-05-19 18:30:48 +02:00
Adria Navarro
c7bbd9be2f Fix integration tests 2023-05-19 18:00:53 +02:00
Adria Navarro
986d4c4740 Merge branch 'develop' into chore/esbuild 2023-05-19 17:26:47 +02:00
Adria Navarro
e030dd866d Fix cluster 2023-05-19 16:26:49 +02:00
Adria Navarro
f27c4ae55a Use nx/esbuild for worker docker & dev 2023-05-19 14:45:05 +02:00
Adria Navarro
0a2335a047 Merge pull request #10622 from Budibase/chore/improve_pipeline_times
Chore - Improve pipeline run time
2023-05-19 13:18:21 +02:00
Adria Navarro
e47aef13d5 Fix jest refs 2023-05-19 10:36:23 +02:00
Adria Navarro
0850ee7b8c Fix flakiness 2023-05-18 17:38:23 +02:00
Adria Navarro
0895f9f44d Check types 2023-05-18 11:29:51 +02:00
mike12345567
f3785892a9 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-05-17 12:45:28 +01:00
mike12345567
55ec808a82 Fixing comment. 2023-05-16 15:47:38 +01:00
Adria Navarro
0882046ea2 Test search by email 2023-05-10 14:53:30 +02:00
Adria Navarro
999dcebb74 Merge branch 'develop' into budi-6158/allow_searching_users 2023-05-10 12:40:08 +02:00
Adria Navarro
f0194ac96b Pro referencing 0.0.1 2023-05-10 12:39:24 +02:00
Adria Navarro
c05a93f875 Test last page search 2023-05-10 12:33:11 +02:00
Adria Navarro
3de3ddfa62 Add tests 2023-05-10 12:33:11 +02:00
Adria Navarro
63244e1dde Add test 2023-05-10 12:33:11 +02:00
Adria Navarro
8bbfa7e0ab Dynamic groups for testing 2023-05-10 12:31:09 +02:00
Adria Navarro
ad257366cf Merge branch 'develop' into budi-6158/paginage-group-users 2023-05-10 10:37:38 +02:00
Adria Navarro
a4e97f768b Add group name limit 2023-05-08 13:26:26 +02:00
Adria Navarro
cd47bc20a2 Test name trimming 2023-05-08 12:45:30 +02:00
Adria Navarro
1b44f8b18b Do not allow empty names on request 2023-05-08 12:42:51 +02:00
Adria Navarro
752790f3c9 Do not allow undefined names on request 2023-05-08 12:41:48 +02:00
Adria Navarro
4eaa95fc41 Type contexts 2023-05-05 16:31:53 +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
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
Budibase Release Bot
cd08227d21 Update pro version to 2.6.5 2023-05-05 11:20:15 +00:00
Budibase Release Bot
eb5e962e65 v2.6.5 2023-05-05 11:18:39 +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
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
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
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
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
cc83d7458e Merge branch 'chore/npmless-builds' into chore/esbuild
# Conflicts:
#	packages/pro
#	yarn.lock
2023-05-04 10:32:58 +01: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
790f7bf3aa Fix worker build 2023-05-03 18:05:21 +01:00
Adria Navarro
8f2d4c94b3 Fix paths 2023-05-03 18:05:21 +01:00
Adria Navarro
19da68f822 Remove tsconfig references 2023-05-03 18:04:57 +01:00
Adria Navarro
a7f69231d9 Merge branch 'chore/npmless-builds' into chore/esbuild 2023-05-03 18:01:04 +01: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
b4551bb5ca Fix scripts 2023-05-02 15:06:05 +01:00
Adria Navarro
f426ba1ac3 Merge branch 'chore/npmless-builds' into chore/esbuild 2023-05-02 14:56:34 +01: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
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