1
0
Fork 0
mirror of synced 2024-09-19 18:59:06 +12:00
Commit graph

895 commits

Author SHA1 Message Date
Martin McKeaveney
df927e3feb merge with master 2021-08-04 13:20:11 +01:00
mike12345567
3aac3b30d0 Linting. 2021-08-04 11:35:25 +01:00
mike12345567
a55c823768 Merge branch 'feature/multi-tenants' of github.com:Budibase/budibase into feature/multi-tenants 2021-08-04 11:17:04 +01:00
mike12345567
d4dbfc834d Removing divider from org page as per comments. 2021-08-04 11:12:57 +01:00
Michael Drury
ec26f6ab5e Merge branch 'develop' into feature/multi-tenants 2021-08-04 10:07:31 +01:00
Michael Drury
b86a6fddc9 Revert "Multi-tenancy/organisations" 2021-08-04 10:02:24 +01:00
Michael Drury
2456e69483 Merge pull request #2076 from Budibase/feature/multi-tenants
Multi-tenancy/organisations
2021-08-04 10:01:22 +01:00
mike12345567
e7974f7e86 Implementing some changes to how context gets set for tenancy, after testing, as well as updating server. 2021-08-03 15:32:25 +01:00
mike12345567
10bb31afd2 Linting. 2021-07-30 20:40:38 +01:00
mike12345567
af9b0a738d Fixing issues with pages reloading in weird ways. 2021-07-30 20:39:42 +01:00
mike12345567
776f176f5c Fix for issue #2167, the foreign key was not being set correctly in all scenarios for the from table in SQL relationships, our test data happened to hide this fact due to the foreign key and the key in from table having the same name. 2021-07-30 18:49:36 +01:00
Rory Powell
73d1cb41d8 Sync profile picture when using SSO 2021-07-29 14:43:23 +01:00
Martin McKeaveney
61759ab1c4 Merge pull request #2157 from mslourens/update_app_role_bug
fix update role modal
2021-07-28 22:38:52 +01:00
Maurits Lourens
661ba80e5c fix update role modal 2021-07-28 17:56:52 +02:00
Maurits Lourens
c9dd9594bc fix lint issue 2021-07-28 00:09:15 +02:00
mike12345567
35f1b50511 Fixing an issue where you could accidentally end up on org/admin page due to the reactivity statements firing all the time. 2021-07-27 17:56:39 +01:00
Maurits Lourens
c84cf22129 rename an app 2021-07-27 17:34:18 +02:00
mike12345567
5324f506b6 Linting. 2021-07-27 16:24:39 +01:00
mike12345567
adf6d18cb1 Fixing some issues with public endpoints causing logout loop. 2021-07-27 16:17:02 +01:00
mike12345567
615053f201 Fixing some issues with org not being correctly detected. 2021-07-27 15:35:26 +01:00
mike12345567
1b40740709 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-27 10:32:18 +01:00
mike12345567
a279e5e504 Removing un-necessary log statements. 2021-07-26 13:40:50 +01:00
mike12345567
4606248ffd Fixing up everything found when testing with Cypress. 2021-07-26 13:19:47 +01:00
Rory Powell
c7cf415288 Merge pull request #2110 from mslourens/bug/automate_setup_menu
Automate setup menu
2021-07-26 09:15:45 +01:00
Maurits Lourens
98ce904b80 fix overflow in automation setup menu for large tables 2021-07-26 10:01:02 +02:00
Rory Powell
8850771a49 Add dedicateed renderer for roles tags 2021-07-25 21:14:49 +01:00
Michael Drury
3d8ac487c4 Merge branch 'develop' into new_roles_bug 2021-07-25 11:07:25 +01:00
Maurits Lourens
03ecf7f34f display role names instead of _id 2021-07-23 23:27:38 +02: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
Rory Powell
6359f3db64 Default google activated form toggle to true for older configs 2021-07-23 16:02:38 +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
5611c8e73e Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-22 14:27:12 +01:00
mike12345567
27b2a13817 Swapping admin -> global in worker to reduce confusion in API url naming. 2021-07-22 12:56:47 +01:00
Keviin Åberg Kultalahti
d9d08841e9 simplify check 2021-07-22 12:41:02 +02:00
Keviin Åberg Kultalahti
558b58b051 uses db to store feedback submissions status 2021-07-22 12:38:46 +02:00
mike12345567
371e38fcb9 Linting. 2021-07-21 18:24:58 +01:00
mike12345567
63368fdae9 Adding query string functionality to skip org setup. 2021-07-21 18:23:49 +01:00
mike12345567
be1558e1e7 Adding mechanism to disable org functionality when multi-tenancy disabled. 2021-07-21 17:52:42 +01:00
mike12345567
a9752c0939 Adding change org button to login page. 2021-07-21 11:47:47 +01:00
Keviin Åberg Kultalahti
60b17594f5 move cookie updating to the NPS component 2021-07-21 12:36:04 +02:00
Keviin Åberg Kultalahti
2c01db04d8 Merge branch 'develop' into feature/nps-feedback-form 2021-07-21 12:29:12 +02:00
Keviin Åberg Kultalahti
5b0557bc28 Adds last bits to NPS feedback form 2021-07-21 12:28:38 +02: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
ddfc524fcb Fixing callback URLs. 2021-07-20 17:57:07 +01:00
mike12345567
9d89362af1 Fixing some issues discovered with logging in. 2021-07-20 17:46:41 +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