Commit Graph

439 Commits

Author SHA1 Message Date
mike12345567 9a9c552629 Adding mechanism for lookup of userId/email to tenantId. 2021-07-23 19:22:04 +01:00
mike12345567 bd301cf972 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-23 17:52:30 +01:00
mike12345567 82e43e0008 Removing accidental symbols. 2021-07-23 17:26:54 +01:00
mike12345567 9377c7b0f3 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-23 17:20:41 +01:00
Budibase Staging Release Bot f0163b3942 v0.9.79-alpha.4 2021-07-23 16:13:42 +00:00
mike12345567 7588bfde39 Adjusting how redis modules are loaded, making sure client is always set, before init. 2021-07-23 16:53:22 +01:00
Budibase Staging Release Bot 69b2bee2e1 v0.9.79-alpha.3 2021-07-23 15:46:11 +00:00
Rory Powell eb8d857864 Require https callback in production, allow for http otherwise 2021-07-23 15:47:48 +01:00
Budibase Staging Release Bot 32cf132022 v0.9.79-alpha.2 2021-07-23 14:05:23 +00:00
Rory Powell 9958625814 Merge pull request #2073 from Budibase/fix/google-button
Mark google activated by default for old configs
2021-07-23 14:56:44 +01:00
Rory Powell 418637cb6b Linting 2021-07-23 14:42:28 +01:00
Rory Powell f95b550b15 Mark google activated by default for old configs 2021-07-23 14:40:22 +01:00
Budibase Staging Release Bot 885d3003fe v0.9.79-alpha.1 2021-07-23 11:08:21 +00:00
Rory Powell 249df46770 Mark google activated by default for old configs 2021-07-23 11:38:17 +01:00
Budibase Staging Release Bot f3f60aee78 v0.9.79-alpha.0 2021-07-23 09:37:21 +00:00
mike12345567 3f7bafe23d Linting. 2021-07-22 22:37:20 +01:00
mike12345567 313302cae2 Fixing test cases and bugs that they raised. 2021-07-22 22:36:16 +01:00
mike12345567 24012c2fba Linting. 2021-07-22 16:37:50 +01:00
mike12345567 1d6a350311 Changing how flags are handled. 2021-07-22 16:36:21 +01:00
mike12345567 b21fe320c5 Adding fallbacks for oidc and google. 2021-07-22 15:26:14 +01:00
mike12345567 1b6a73c250 Linting. 2021-07-22 14:29:30 +01:00
mike12345567 27b2a13817 Swapping admin -> global in worker to reduce confusion in API url naming. 2021-07-22 12:56:47 +01:00
mike12345567 3305400c83 Fixing saving of oidc and google auth, neither should require the callbackURL property with the tenancy update. 2021-07-21 11:10:26 +01:00
mike12345567 b09c2d45f9 Linting and adding tenancy API. 2021-07-20 18:03:16 +01:00
mike12345567 129ff3fef2 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-20 15:56:12 +01:00
Peter Clement 3f42ed74b9 Merge remote-tracking branch 'origin/develop' into oidc-config-management 2021-07-20 12:57:58 +01:00
Peter Clement 0fa68a2d50 Add activated toggle and login functionality to support this 2021-07-20 09:27:12 +01:00
mike12345567 83db31f899 A lot of general fixes around getting logged in, setting up users etc. 2021-07-19 19:00:53 +01:00
mike12345567 358b2aef89 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-19 17:35:48 +01:00
mike12345567 e026375f50 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-19 16:24:19 +01:00
Budibase Release Bot d8136d0704 v0.9.78 2021-07-19 14:23:03 +00:00
mike12345567 e56a0f5aa3 Fixing some tenancy issues. 2021-07-19 12:57:52 +01:00
Budibase Release Bot ec19ff23c2 v0.9.77 2021-07-16 18:52:46 +00:00
mike12345567 d157285918 Adding organisation page. 2021-07-16 18:24:32 +01:00
mike12345567 f3156fca06 Further work, tenancy now working but some more work to be done. 2021-07-16 18:04:49 +01:00
mike12345567 b7995dd61d Updating auth to utilise the tenant system. 2021-07-16 15:08:58 +01:00
Budibase Release Bot 2668f2ba40 v0.9.76 2021-07-15 23:23:00 +00:00
mike12345567 912659a8ad First version of multi-tenancy, work still to be done. 2021-07-15 17:57:02 +01:00
Rory Powell 5f51de257f Default public config.config when missing 2021-07-15 16:50:57 +01:00
Rory Powell 806957e462 Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support 2021-07-15 16:21:03 +01:00
Rory Powell 33b352c3ef Store OIDC config in cookie instead of URL 2021-07-15 16:20:31 +01:00
Peter Clement 70ab4e4dc5 add new logic to support oauth and oidc buttons 2021-07-15 15:49:10 +01:00
Rory Powell 239e39e5ed Merge branch 'develop' into feature/oidc-support 2021-07-15 14:05:30 +01:00
Budibase Release Bot 2bd7934518 v0.9.75 2021-07-15 10:12:28 +00:00
Michael Drury fd76e532c7 Merge pull request #1989 from Budibase/fix/email-explanation
Email template descriptions/information
2021-07-15 11:04:36 +01:00
mike12345567 3eb82b5a63 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-14 13:54:39 +01:00
mike12345567 ae3a09d560 Merge branch 'master' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-14 13:53:57 +01:00
mike12345567 a9160f5914 Rewording email template descriptions. 2021-07-14 13:24:46 +01:00
mike12345567 a31cce0ff9 Linting. 2021-07-14 13:18:27 +01:00
mike12345567 c20fde41ee Some quick fixes after a user had some confusion over how the email templating works, just adding some detail that should help explain. 2021-07-14 11:23:24 +01:00