Commit Graph

953 Commits

Author SHA1 Message Date
mike12345567 52b44736c5 Fixing another issue with ethereal test package. 2021-10-07 16:35:11 +01:00
mike12345567 efb09523a7 Fixing a small issue with email test fix. 2021-10-07 16:14:00 +01:00
mike12345567 fab766adb6 Adding functionality to check if ethereal is down, if it is don't fail the test. 2021-10-07 16:11:33 +01:00
mike12345567 795477e025 Merge branch 'master' of github.com:Budibase/budibase into fix/tenant-public 2021-10-07 13:11:20 +01:00
mike12345567 e6844d7bdf Fix an issue with current app cookie, get rid of it on login/logout. 2021-10-07 12:19:23 +01:00
Budibase Release Bot cab95ff355 v0.9.156 2021-10-07 07:50:40 +00:00
Budibase Release Bot e0b061a1db v0.9.155 2021-10-06 21:26:52 +00:00
Budibase Release Bot 4f628dd3af v0.9.154 2021-10-06 16:37:28 +00:00
Martin McKeaveney 2f9f30ad8c merge with master 2021-10-06 17:23:13 +01:00
Budibase Staging Release Bot 6e11aa2cec v0.9.153-alpha.2 2021-10-06 16:12:27 +00:00
Rory Powell 615d0390d5 Honour cookie domain when custom sso is enabled 2021-10-06 16:50:15 +01:00
Budibase Release Bot 84b945cbe8 v0.9.153 2021-10-06 15:36:11 +00:00
Budibase Staging Release Bot 0489bb5ee0 v0.9.153-alpha.1 2021-10-06 15:23:47 +00:00
Martin McKeaveney 2f5ab466b0 Merge pull request #2901 from Budibase/fix/custom-sso-enforce-cross-tenancy
Don't let user exist in multiple tenants when using custom sso
2021-10-06 16:14:34 +01:00
Budibase Staging Release Bot 1e209958fd v0.9.153-alpha.0 2021-10-06 15:02:59 +00:00
Budibase Release Bot a046f9f0b0 v0.9.152 2021-10-06 14:19:18 +00:00
Rory Powell ee10bce48b Don't let user exist in multiple tenants when using custom sso 2021-10-06 15:15:46 +01:00
Budibase Staging Release Bot 738e87dd69 v0.9.152-alpha.0 2021-10-06 14:08:17 +00:00
Martin McKeaveney 3bc1771ede merge with master 2021-10-06 14:57:34 +01:00
Budibase Staging Release Bot f879836227 v0.9.151-alpha.4 2021-10-06 12:38:24 +00:00
Budibase Staging Release Bot f7667f7e47 v0.9.151-alpha.3 2021-10-05 11:23:23 +00:00
Budibase Staging Release Bot d501f53b68 v0.9.151-alpha.2 2021-10-05 11:07:22 +00:00
Michael Drury b120477572 Merge pull request #2886 from Budibase/email-user-name
Using the user's name in emails sent out where possible
2021-10-05 11:59:14 +01:00
Budibase Staging Release Bot cfa5e5be73 v0.9.151-alpha.1 2021-10-04 17:25:50 +00:00
mike12345567 1f95c693ac As with the account portal, updating the monorepo to use the users name if it is available for some email templates. 2021-10-04 17:59:25 +01:00
Budibase Release Bot a31c07626e v0.9.151 2021-10-04 16:25:23 +00:00
Budibase Staging Release Bot 2ef2ae6253 v0.9.151-alpha.0 2021-10-04 15:58:42 +00:00
Rory Powell d4680ccb95 Merge branch 'master' into develop 2021-10-04 16:49:18 +01:00
Budibase Staging Release Bot 314675912f v0.9.150-alpha.1 2021-10-04 15:37:08 +00:00
Rory Powell ec35b81af8 Fix backup SMTP 2021-10-04 15:58:05 +01:00
Budibase Release Bot 4891cc7199 v0.9.150 2021-10-04 14:02:30 +00:00
Budibase Staging Release Bot 15bb373794 v0.9.150-alpha.0 2021-10-04 13:30:07 +00:00
Rory Powell 2d5d0d48fb Merge branch 'master' into develop 2021-10-04 14:21:46 +01:00
Rory Powell 2f589a2f42 Add API keys between account portal and budibase 2021-10-04 13:40:50 +01:00
Budibase Staging Release Bot 685fc49b01 v0.9.149-alpha.5 2021-10-04 11:51:19 +00:00
Rory Powell d63186ff8f Fix email link from internal bb onboarding. Prevent account holder from being deleted 2021-10-04 11:30:59 +01:00
Budibase Staging Release Bot be7d343868 v0.9.149-alpha.4 2021-10-01 15:41:08 +00:00
Budibase Release Bot 7602985d25 v0.9.149 2021-10-01 15:40:26 +00:00
Budibase Staging Release Bot be265bf787 v0.9.149-alpha.3 2021-10-01 15:25:11 +00:00
Martin McKeaveney 063b92726c Merge pull request #2854 from Budibase/local-tenant-subdomain
Support for tenancy subdomain locally + improvements
2021-10-01 16:15:18 +01:00
Budibase Staging Release Bot 4ada3e12be v0.9.149-alpha.2 2021-10-01 15:10:31 +00:00
Rory Powell 3bef997168 Support for tenancy subdomain locally + improvements 2021-10-01 15:55:57 +01:00
Budibase Staging Release Bot 3c02b6a1c5 v0.9.149-alpha.1 2021-10-01 14:53:11 +00:00
Budibase Staging Release Bot 67a664e6ba v0.9.149-alpha.0 2021-10-01 14:28:01 +00:00
Martin McKeaveney c2d2c7d090 merge 2021-10-01 15:18:37 +01:00
Budibase Staging Release Bot f04baeaa7e v0.9.148-alpha.9 2021-10-01 14:10:48 +00:00
Michael Drury a01eb8aaa0 Merge pull request #2844 from Budibase/fix/smtp-automation
Fixing server -> worker internal comms
2021-10-01 15:01:37 +01:00
Budibase Staging Release Bot aad4fe9f8e v0.9.148-alpha.8 2021-10-01 13:52:11 +00:00
mike12345567 2aa90aa246 Merge branch 'develop' of github.com:Budibase/budibase into fix/smtp-automation 2021-10-01 14:46:48 +01:00
Budibase Staging Release Bot 765f0b6c9f v0.9.148-alpha.7 2021-10-01 13:22:35 +00:00
mike12345567 be09410cae Quick fix for worker, API key was not considered good enough to access worker, updated this and added better error to smtp action. 2021-10-01 13:29:08 +01:00
Budibase Staging Release Bot 3343a36694 v0.9.148-alpha.6 2021-10-01 12:05:19 +00:00
Budibase Staging Release Bot f15314f690 v0.9.148-alpha.5 2021-10-01 11:44:53 +00:00
Budibase Staging Release Bot 62205f5f55 v0.9.148-alpha.4 2021-10-01 10:56:48 +00:00
Budibase Staging Release Bot 355e4be03d v0.9.148-alpha.3 2021-10-01 10:20:06 +00:00
Budibase Release Bot e75610b780 v0.9.148 2021-10-01 09:13:03 +00:00
Budibase Staging Release Bot 8c26e18706 v0.9.148-alpha.2 2021-09-30 16:51:01 +00:00
Budibase Staging Release Bot 206ff8aad2 v0.9.148-alpha.1 2021-09-30 16:15:24 +00:00
Budibase Staging Release Bot 606ceca1bc v0.9.148-alpha.0 2021-09-30 15:51:50 +00:00
Budibase Release Bot 4928ce6875 v0.9.147 2021-09-30 14:33:09 +00:00
Budibase Staging Release Bot 638c9f9711 v0.9.147-alpha.0 2021-09-30 14:22:16 +00:00
Rory Powell 95c251d4db Merge branch 'master' into develop 2021-09-30 15:08:40 +01:00
Budibase Staging Release Bot b198f38940 v0.9.146-alpha.6 2021-09-30 14:05:41 +00:00
Michael Drury 29b177208c Merge pull request #2815 from Budibase/feature/cloud-export
Cloud export -> self host import
2021-09-30 14:55:37 +01:00
Budibase Staging Release Bot 8a10d549b7 v0.9.146-alpha.5 2021-09-30 13:49:21 +00:00
Rory Powell fe6dbb2a78 Merge pull request #2816 from Budibase/remove-global-info-users-on-deletion
Remove global info users on user deletion
2021-09-30 14:41:27 +01:00
Budibase Staging Release Bot 8226859e07 v0.9.146-alpha.4 2021-09-30 12:59:29 +00:00
Rory Powell 3fb83eabad Merge branch 'develop' into remove-global-info-users-on-deletion 2021-09-30 13:38:12 +01:00
Rory Powell 6e10c1fa73 Remove global info users on user deletion 2021-09-30 13:08:07 +01:00
mike12345567 f8562015ac Merge branch 'develop' of github.com:Budibase/budibase into feature/cloud-export 2021-09-30 12:22:28 +01:00
Budibase Staging Release Bot 44a3390200 v0.9.146-alpha.3 2021-09-30 10:23:22 +00:00
Rory Powell 4d873a00bc Merge pull request #2810 from Budibase/fix/save-user
Fix saveUser by adding same tenant check
2021-09-30 11:00:03 +01:00
Budibase Staging Release Bot 2b4fc4aa8b v0.9.146-alpha.2 2021-09-30 09:58:13 +00:00
Rory Powell b64f1aa322 Fix saveUser by adding same tenant check 2021-09-30 10:27:35 +01:00
Budibase Release Bot ba6730645e v0.9.146 2021-09-29 19:01:05 +00:00
Budibase Staging Release Bot 5fffd72e2f v0.9.146-alpha.1 2021-09-29 18:38:14 +00:00
Martin McKeaveney 6edc25f52e Merge pull request #2804 from Budibase/fix/redirect-loop-ff
fix firefox redirect loop
2021-09-29 19:27:15 +01:00
Martin McKeaveney e4473a32fd fix firefox redirect loop 2021-09-29 18:59:26 +01:00
Budibase Staging Release Bot 95424ddc6a v0.9.146-alpha.0 2021-09-29 17:08:46 +00:00
Rory Powell b47003f359 Merge pull request #2803 from Budibase/fix/provisioning-only-check-verified
Update existing user in account portal check to only check verified users - fix provision flow
2021-09-29 17:58:12 +01:00
Rory Powell 8d80f89f97 Merge branch 'master' into develop 2021-09-29 17:57:27 +01:00
Rory Powell f089c20d60 replace ?. with && 2021-09-29 17:55:08 +01:00
Rory Powell 93d4ee4aad Update existing user in account portal check to only check verified users - fix provision flow 2021-09-29 17:46:13 +01:00
Budibase Staging Release Bot 8aa192d1e8 v0.9.145-alpha.1 2021-09-29 16:27:46 +00:00
Rory Powell ee7529769f Merge pull request #2789 from Budibase/feature/deprovisioning
Tenant deprovisioning
2021-09-29 17:17:26 +01:00
mike12345567 a0f69251c8 Adding the ability to run the monorepo in cloud mode without the connected account portal (login, org setting and admin creation are all available again) as well as re-working how the redirects work to massively reduce the chance of cycles which I was experiencing constantly. 2021-09-29 16:55:59 +01:00
Budibase Release Bot f5103225c7 v0.9.145 2021-09-29 13:55:56 +00:00
Budibase Staging Release Bot b8a33d5037 v0.9.145-alpha.0 2021-09-29 13:36:20 +00:00
Rory Powell c74c577ab9 Deprovision complete 2021-09-29 12:25:01 +01:00
Budibase Release Bot 085c082600 v0.9.144 2021-09-29 10:51:15 +00:00
Budibase Staging Release Bot 435ba81852 v0.9.144-alpha.0 2021-09-29 10:39:31 +00:00
Rory Powell 591203f5cd Deprovisioning working minus apps 2021-09-29 11:36:24 +01:00
Martin McKeaveney 05cc0e11bf merge with master 2021-09-29 11:25:38 +01:00
Martin McKeaveney 34bc75cf98 Merge pull request #2784 from Budibase/fix/email-colors
Adding important to some email color properties (link color)
2021-09-29 11:10:50 +01:00
Budibase Staging Release Bot 90cb5b6b5f v0.9.143-alpha.10 2021-09-29 09:54:01 +00:00
mike12345567 cb5f513881 Adding important to some email color properties. 2021-09-29 10:32:14 +01:00
Budibase Staging Release Bot 1236b70bf9 v0.9.143-alpha.9 2021-09-29 09:06:03 +00:00
Budibase Staging Release Bot 0fa8accc6a v0.9.143-alpha.8 2021-09-29 08:27:38 +00:00
Budibase Staging Release Bot 875e64e5a6 v0.9.143-alpha.7 2021-09-28 16:50:47 +00:00
Rory Powell 0fec07d157 Merge pull request #2769 from Budibase/fix/account-email-clash
Prevent root account users being re-created as internal budibase users
2021-09-28 17:38:34 +01:00
Budibase Staging Release Bot 4f8da83dae v0.9.143-alpha.6 2021-09-28 16:35:28 +00:00
Rory Powell 9942a2d85c Merge branch 'develop' into feature/deprovisioning 2021-09-28 17:13:04 +01:00
Budibase Staging Release Bot fd7e768ea1 v0.9.143-alpha.5 2021-09-28 16:04:16 +00:00
Rory Powell 4b30a4e7ef Prevent duplicate internal budibase users across tenants 2021-09-28 15:49:03 +01:00
Rory Powell b964813fad Prevent root account users being re-created as internal budibase users 2021-09-28 15:22:19 +01:00
Budibase Staging Release Bot c03b9afbee v0.9.143-alpha.4 2021-09-28 12:41:39 +00:00
Budibase Staging Release Bot fc8aa07bf4 v0.9.143-alpha.3 2021-09-28 12:21:31 +00:00
Budibase Staging Release Bot 5605209a7a v0.9.143-alpha.2 2021-09-28 10:53:02 +00:00
Budibase Staging Release Bot 9e8b14f0fb v0.9.143-alpha.1 2021-09-28 09:24:39 +00:00
Rory Powell 8642868c5e Deprovisioning WIP 2021-09-28 09:48:00 +01:00
Budibase Release Bot ecb10ccd3b v0.9.143 2021-09-27 21:50:12 +00:00
Budibase Staging Release Bot ece3010c4e v0.9.143-alpha.0 2021-09-27 21:39:06 +00:00
Martin McKeaveney 5a56570fdb merge master 2021-09-27 22:31:13 +01:00
Budibase Staging Release Bot b2b13dc719 v0.9.140-alpha.13 2021-09-27 17:39:48 +00:00
Martin McKeaveney 1e3fca15c5 abstract usagedoc creation into auth, create the doc if it doesn't exist 2021-09-27 17:35:22 +01:00
Martin McKeaveney bd1f6752ff merge with develop 2021-09-27 16:37:55 +01:00
Martin McKeaveney 2da28ecc71 prevent SMTP fallback for automations 2021-09-27 16:28:39 +01:00
Budibase Staging Release Bot f9525b9065 v0.9.140-alpha.12 2021-09-27 14:25:00 +00:00
Martin McKeaveney c25bd48616 SMTP config fallback logic 2021-09-27 15:10:06 +01:00
Martin McKeaveney 5b4bf74e2c re-adding env var controls for cloud limit functionality 2021-09-27 15:03:48 +01:00
Martin McKeaveney 35d4eac78a fallback SMTP configuration for cloud 2021-09-27 14:57:22 +01:00
Martin McKeaveney 3b49866825 Merge branch 'develop' of github.com:Budibase/budibase into cloud-limits 2021-09-27 12:53:15 +01:00
Budibase Staging Release Bot 5f109cf9e2 v0.9.140-alpha.11 2021-09-27 10:48:31 +00:00
Martin McKeaveney 6c7423e52e ensure automation quotas are not incremented for test runs 2021-09-27 10:32:39 +01:00
Budibase Staging Release Bot 9d199d6dda v0.9.140-alpha.10 2021-09-24 12:27:55 +00:00
Budibase Staging Release Bot 24e3b30dbf v0.9.140-alpha.9 2021-09-24 10:23:39 +00:00
Martin McKeaveney c49b88b57a automation runs quotas 2021-09-23 23:25:25 +01:00
Martin McKeaveney 4a2028c354 usageQuota middleware writing to couch 2021-09-23 22:40:14 +01:00
Budibase Staging Release Bot 790950be39 v0.9.140-alpha.8 2021-09-23 16:11:26 +00:00
Budibase Release Bot ce3f8a364f v0.9.142 2021-09-23 15:48:36 +00:00
Martin McKeaveney 9b98985040 point logo upload to S3 bucket when not self hosted 2021-09-23 16:22:12 +01:00
Budibase Staging Release Bot b8d0e335d5 v0.9.140-alpha.7 2021-09-23 11:33:58 +00:00
Budibase Staging Release Bot 28d0025d6a v0.9.140-alpha.6 2021-09-23 08:49:16 +00:00
Budibase Staging Release Bot 443de819ff v0.9.140-alpha.5 2021-09-22 17:31:55 +00:00
Michael Drury f45c780d99 Merge pull request #2698 from Budibase/feature/view-cloud-replacement
Cloud View replacement
2021-09-22 18:21:38 +01:00
Budibase Staging Release Bot 45bb8915d6 v0.9.140-alpha.4 2021-09-22 15:03:22 +00:00
Martin McKeaveney 68a72384c8 Merge pull request #2703 from Budibase/feature/analytics
Feature/analytics
2021-09-22 15:53:34 +01:00
Budibase Release Bot ecbe015c2a v0.9.141 2021-09-22 11:36:15 +00:00
Martin McKeaveney 8155a28a43 merge with develop 2021-09-22 12:27:08 +01:00
Budibase Staging Release Bot 882187401b v0.9.140-alpha.3 2021-09-22 11:07:23 +00:00
Michael Drury 75f7629b52 Merge pull request #2705 from Budibase/merge/tmpl
Merge all tmpl
2021-09-22 11:57:36 +01:00
Budibase Staging Release Bot 7d3a3bf19e v0.9.140-alpha.2 2021-09-22 10:53:02 +00:00
Michael Drury 27998e95ad Merge pull request #2688 from Budibase/dependabot/npm_and_yarn/packages/worker/tmpl-1.0.5
Bump tmpl from 1.0.4 to 1.0.5 in /packages/worker
2021-09-22 11:41:41 +01:00
Budibase Staging Release Bot 2cf748eea4 v0.9.140-alpha.1 2021-09-22 08:58:01 +00:00
Rory Powell f62b525736 Merge pull request #2691 from Budibase/feature/onboarding-backend
SSO flow and account deletion
2021-09-22 09:47:06 +01:00
Budibase Release Bot 297be18159 v0.9.140 2021-09-22 08:42:24 +00:00
Martin McKeaveney 87b61b5c54 added user created at timestamp 2021-09-22 09:29:51 +01:00
Budibase Staging Release Bot 3ba43a1b35 v0.9.140-alpha.0 2021-09-21 20:57:20 +00:00
dependabot[bot] 63f1e0c836 Bump tmpl from 1.0.4 to 1.0.5 in /packages/worker
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-21 20:43:53 +00:00
Martin McKeaveney e2ed2e8b56 merge from master 2021-09-21 21:42:52 +01:00