Commit Graph

3636 Commits

Author SHA1 Message Date
mike12345567 1631aa698b Updating binding tests. 2021-05-25 16:52:35 +01:00
mike12345567 1564724dc3 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-05-25 16:02:06 +01:00
mike12345567 069de1fdb1 Updating Automation cypress tests, now functional. 2021-05-25 15:57:38 +01:00
Martin McKeaveney 1150593e74 v0.9.5 2021-05-25 15:40:12 +01:00
Andrew Kingston 104298371a Fix case of group by button 2021-05-25 15:33:04 +01:00
Keviin Åberg Kultalahti ab56fceaae fix double page component issue in email section 2021-05-25 15:25:56 +02:00
Keviin Åberg Kultalahti 3dc7ba268e remove unused component in manage layout 2021-05-25 15:19:10 +02:00
mike12345567 08fef5fabd Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-05-25 13:32:43 +01:00
mike12345567 9efc5162ab Removing request button. 2021-05-25 13:29:15 +01:00
mike12345567 1146d508fd Fixing app cypress test cases. 2021-05-25 13:25:42 +01:00
Martin McKeaveney 3a53dbe1f7 v0.9.4 2021-05-25 12:44:36 +01:00
Martin McKeaveney 9564285917 fix stale topNav history state causing wrong apps to show 2021-05-25 12:42:55 +01:00
mike12345567 921eb39227 Fixing the creation of user in cypress. 2021-05-25 11:06:50 +01:00
Andrew Kingston 41fb234499 Update autoscreens to use better spectrum-compatible styles and fonts 2021-05-25 10:15:10 +01:00
Andrew Kingston 6c960dd9e2 Replace font-weight 500 with 600 as source sans pro does not have a 500 weight, and update autoscreens and templates to use source sans pro 2021-05-25 10:11:41 +01:00
Andrew Kingston 3c5696199a Remove Inter font fully and replace with Source Sans Pro, fix favicon import path 2021-05-25 09:41:23 +01:00
Andrew Kingston e81b9ce66a Remove login form component 2021-05-25 08:26:43 +01:00
Andrew Kingston 4e67369277 Fix case of edit roles button 2021-05-25 08:24:00 +01:00
Martin McKeaveney 4c9c7b05a3 v0.9.3 2021-05-24 21:54:28 +01:00
Michael Drury b5da856c64 Merge pull request #1545 from Budibase/fix/user-setup-builder-admin
Ability to configure invited users as admins/builders
2021-05-24 20:40:32 +01:00
Martin McKeaveney 39b6ab7790 Merge pull request #1547 from Budibase/fix/minio
remove public folder concept, upload client lib directly
2021-05-24 20:19:12 +01:00
Martin McKeaveney 1b920a2f16 remove public folder concept, upload client lib directly 2021-05-24 19:49:34 +01:00
Andrew Kingston 8c52af4cf7 Merge pull request #1546 from Budibase/ak-fixes
More logo updates + fixes
2021-05-24 19:39:08 +01:00
Andrew Kingston 1e818a35c5 Add back readable text for oauth checklist step 2021-05-24 19:33:28 +01:00
Andrew Kingston 4c1fb33ad0 Replace builder logo with new space logo 2021-05-24 19:23:46 +01:00
mike12345567 18dd7322e4 Updating system to allow setting builder/admin as a toggle during the invitation phase of a user. 2021-05-24 18:45:43 +01:00
Andrew Kingston a77e1c0365 Update favicon 2021-05-24 18:29:34 +01:00
Martin McKeaveney 40abd4fe3d v0.9.2 2021-05-24 17:20:20 +01:00
Michael Drury ea447b410b Merge pull request #1543 from Budibase/fix/mike-fixes
Some fixes for Redis
2021-05-24 17:06:33 +01:00
Andrew Kingston 4a53d4c11e Hide developer mode option when you aren't a developer 2021-05-24 16:49:43 +01:00
mike12345567 55aba6b824 Changing cypress commands. 2021-05-24 16:32:42 +01:00
mike12345567 85102fab4e Changing how connection is waited for. 2021-05-24 16:31:50 +01:00
Andrew Kingston d856eae6f7 Fix logo size on create admin screen 2021-05-24 16:28:08 +01:00
Andrew Kingston 2c580e6b30 Fix links to apps from non-builder app list not working 2021-05-24 16:22:39 +01:00
Andrew Kingston 9ea9b83fee Add real Budibase space logo as the default logo 2021-05-24 16:19:29 +01:00
Andrew Kingston 844158bb3c Add real updated timestamp to non-builder app list 2021-05-24 15:47:55 +01:00
Andrew Kingston bba1cea7b3 Implement real sorting by app updated timestamp 2021-05-24 14:16:28 +01:00
Andrew Kingston ecfd41d535 Add real updated timestamp to app table view 2021-05-24 14:11:45 +01:00
Andrew Kingston 5691280961 Stop / route screen being called Login when set to public access 2021-05-24 14:09:19 +01:00
Andrew Kingston b9cfebdad2 Update deployment status message on error 2021-05-24 14:08:55 +01:00
Andrew Kingston 200d006971 Update deployment status message to not confuse user 2021-05-24 14:08:08 +01:00
Michael Drury 0b728f07fa Merge pull request #1538 from Budibase/fix/lockdown-admin
Locking down administration endpoints and routes
2021-05-24 13:49:22 +01:00
Andrew Kingston 514d74a7aa Remove console.log 2021-05-24 12:45:09 +01:00
Andrew Kingston c1a30f8ea1 Remove admin only pages from non-admin menu 2021-05-24 12:44:59 +01:00
Andrew Kingston 1f1431344c Prevent flashing and intermittent errors when navigating to admin screens as a non admin 2021-05-24 12:40:36 +01:00
Martin McKeaveney 4091013376 tidy up 2021-05-23 15:52:21 +01:00
Martin McKeaveney 35e361717c make attachments downloadable and images clickable 2021-05-23 15:40:00 +01:00
Martin McKeaveney f58ad3a12c allow deletion of relationships 2021-05-23 15:06:33 +01:00
mike12345567 0838a45efc Fixing issue with users that don't have admin structure. 2021-05-21 17:19:13 +01:00
mike12345567 59de40c4ef Formatting and adding routing checks to push the user out of admin menus when they are not an admin. 2021-05-21 17:12:25 +01:00
mike12345567 348c61a8c5 Merge branch 'master' of github.com:Budibase/budibase into fix/lockdown-admin 2021-05-21 16:54:52 +01:00
mike12345567 c6a6d49cd7 Updating administration middleware so that internal requests allowed through automatically. 2021-05-21 16:43:01 +01:00
mike12345567 27fc3a3c5e Adding ability to create new admins. 2021-05-21 16:30:37 +01:00
Michael Drury 7fb9673217 Merge pull request #1537 from Budibase/feature/app-updated-at
Mike fixes + application updated at timestamps
2021-05-21 16:10:29 +01:00
Martin McKeaveney 29faf18147 remove superfluous copy 2021-05-21 16:02:49 +01:00
Martin McKeaveney d161f979b6 Merge pull request #1533 from Budibase/martin-fixes
WIP: fixes
2021-05-21 15:49:52 +01:00
Andrew Kingston b00895c7b4 Merge pull request #1526 from Budibase/ak-fixes
AK fixes
2021-05-21 15:44:58 +01:00
Andrew Kingston 9f99058452 Revert login on enter 2021-05-21 15:44:27 +01:00
Andrew Kingston d4518073c6 Change update self method to automatically merge new fields with existing user object 2021-05-21 15:23:39 +01:00
Martin McKeaveney c75d898ca6 Merge branch 'master' of https://github.com/Budibase/budibase into martin-fixes 2021-05-21 15:18:16 +01:00
mike12345567 ede7e38442 Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at 2021-05-21 14:57:41 +01:00
Martin McKeaveney bef216527d simpler check using checklist 2021-05-21 14:55:11 +01:00
mike12345567 095e513f9f Formatting 2021-05-21 14:49:59 +01:00
Martin McKeaveney c06edd8b44 enter to login, google auth only show if configured 2021-05-21 14:45:56 +01:00
mike12345567 a54b582e0d Updating UI to use the updated at. 2021-05-21 14:38:58 +01:00
Andrew Kingston 3cbbde1fe4 Render email template inside iframe and render custom templates inside base template 2021-05-21 14:22:22 +01:00
Andrew Kingston 152a2d921b Remove question mark from field label 2021-05-21 13:56:18 +01:00
Andrew Kingston 1d9ef7f3bf Fix styles of tag renderer to make it readable but remove hover state 2021-05-21 13:55:17 +01:00
Andrew Kingston 2c1c407e81 Fix small typo in user details page 2021-05-21 13:49:25 +01:00
Andrew Kingston ba45481cd7 Add readable labels to Google oauth fields 2021-05-21 13:46:13 +01:00
Andrew Kingston a9c3194eba Merge branch 'master' of github.com:Budibase/budibase into ak-fixes 2021-05-21 13:42:43 +01:00
Andrew Kingston 532c48896a Add repeat password input to admin user creation 2021-05-21 13:35:38 +01:00
Andrew Kingston 7ed13d2b4c Allow enter keypress to submit login form 2021-05-21 13:27:27 +01:00
Andrew Kingston 4deedfc27c Update user avatar to use correct initials 2021-05-21 13:17:45 +01:00
Andrew Kingston 01b6c443ea Fix issue on hot reload when user object was null 2021-05-21 13:17:35 +01:00
Andrew Kingston bc8be04a32 Derive initials from user names and email address 2021-05-21 13:17:09 +01:00
Keviin Åberg Kultalahti 4314a30999 Merge branch 'master' into fixes/user-management 2021-05-21 14:10:36 +02:00
Keviin Åberg Kultalahti d51e1949fa lint fix 2021-05-21 13:43:27 +02:00
Keviin Åberg Kultalahti 9994c61f8f fix login page 2021-05-21 13:33:05 +02:00
Keviin Åberg Kultalahti a4de6d49c8 Merge branch 'master' into fixes/user-management 2021-05-21 13:32:55 +02:00
Keviin Åberg Kultalahti 53f38f6f8f move extracted components into page components 2021-05-21 13:26:55 +02:00
Keviin Åberg Kultalahti 090c54beb9 fix erroneous disable state in resetform 2021-05-21 13:25:40 +02:00
Andrew Kingston 52d0be8b58 Simplify lock logic 2021-05-21 11:49:23 +01:00
Andrew Kingston 93d77d058c Update normal user home screen to reflect changes with app fetching 2021-05-21 11:17:23 +01:00
Andrew Kingston 613841e7dd Remove accidental text 2021-05-21 11:15:35 +01:00
Andrew Kingston b904bba4c7 Merge branch 'master' of github.com:Budibase/budibase into enhanced-app-list 2021-05-21 11:11:43 +01:00
Michael Drury f76c7d9684 Merge pull request #1514 from Budibase/fix/per-app-login
Removing per app login screens
2021-05-21 11:11:21 +01:00
Keviin Åberg Kultalahti ac989fb282 move ResetForm to page component 2021-05-21 12:09:38 +02:00
Keviin Åberg Kultalahti f050b65c45 add check after Login to redirect to resetpassword 2021-05-21 12:09:10 +02:00
Keviin Åberg Kultalahti fc45408d0f add force reset modal 2021-05-21 12:08:31 +02:00
Keviin Åberg Kultalahti acc8fc6232 add forceResetPassword check to layout 2021-05-21 12:08:18 +02:00
Andrew Kingston 28e71e8cef Remove global search bar 2021-05-21 11:02:40 +01:00
Andrew Kingston c174602704 Merge branch 'master' of github.com:Budibase/budibase into enhanced-app-list 2021-05-21 11:00:26 +01:00
Andrew Kingston e1c37752db Rename general settings to organisation and add builder theme to Theming page, add password changing and user info changing to avatar dropdown 2021-05-21 11:00:08 +01:00
Andrew Kingston cc21ed354b Improve app list empty state screen and fix order of app context menu options 2021-05-21 10:37:19 +01:00
Andrew Kingston f63f9a7c51 Update app list screen to show unified app list with publish status 2021-05-21 10:32:16 +01:00
Keviin Åberg Kultalahti 8ca3624e24 fix bug when switching between tabs 2021-05-20 16:57:38 +02:00
Keviin Åberg Kultalahti 8175fdd7a0 workaround to strange onMount bug with many Tabs components 2021-05-20 16:46:20 +02:00
Andrew Kingston 71296670c2 Add return URL's to any unauthenticated requests in the portal or builder 2021-05-20 15:01:59 +01:00
Andrew Kingston 64496759fd Redirect away from auth routes if already authenticated 2021-05-20 15:01:34 +01:00
Keviin Åberg Kultalahti 1a4a13d431 remove unused var 2021-05-20 15:59:08 +02:00
Martin McKeaveney 7103df0013 v0.9.1 2021-05-20 14:53:22 +01:00
Martin McKeaveney fd9f4a3027 v0.9.0 2021-05-20 14:49:19 +01:00
Andrew Kingston 99a2a5caf0 Add return URL to login form 2021-05-20 14:47:36 +01:00
Keviin Åberg Kultalahti 236b17e575 fix not being able to navigate directly to email template 2021-05-20 15:39:21 +02:00
Keviin Åberg Kultalahti 3d746b1217 remove unused imports 2021-05-20 15:13:16 +02:00
Keviin Åberg Kultalahti 46ddaada4d remove transitions because of bug 2021-05-20 15:13:08 +02:00
Keviin Åberg Kultalahti 8f6205a4db fixes layout issues in email templates 2021-05-20 15:03:34 +02:00
Keviin Åberg Kultalahti f730900ed5 fix email templates being unreachable 2021-05-20 14:49:53 +02:00
Keviin Åberg Kultalahti eca38a6fec fixes missing cursor styling 2021-05-20 14:34:19 +02:00
Keviin Åberg Kultalahti 30eb523bd1 Merge branch 'master' into fixes/user-management 2021-05-20 14:12:48 +02:00
mike12345567 d301ea48a9 Removing all login/logout functionality from apps. 2021-05-20 13:05:58 +01:00
mike12345567 58f40da036 Fixing an issue with checkAuth function not checking response status before attempting to get JSON. 2021-05-20 12:39:33 +01:00
Martin McKeaveney 7ab24fed2b merge with master 2021-05-20 10:40:15 +01:00
Keviin Åberg Kultalahti 0346ef9bb1 Merge branch 'next' into fixes/user-management 2021-05-20 11:02:15 +02:00
Mike Shanks aed083ee95 Fix: Unable to use parameters with Rest conenctor 2021-05-20 09:07:51 +01:00
Andrew Kingston 112ef65043 Merge pull request #1505 from Budibase/user-app-list
User home screen + tidy ups
2021-05-20 08:41:44 +01:00
Martin McKeaveney 638a43efb8 Merge pull request #1503 from Budibase/cron
Cron Automation trigger
2021-05-19 19:33:49 +01:00
Andrew Kingston 002f910b29 Change password modal title to 'Update password' 2021-05-19 19:05:15 +01:00
Andrew Kingston 441fbd37fb Prevent creating, deleting or editing global fields for user in the backend UI of the builder 2021-05-19 18:46:15 +01:00
Andrew Kingston d47c48352c Fix app deletion not working 2021-05-19 18:45:43 +01:00
mike12345567 d62280ae83 Merge branch 'next' of github.com:Budibase/budibase into user-app-list 2021-05-19 15:58:17 +01:00
mike12345567 c6f7f115b5 Fixing issues with the user table within the apps. 2021-05-19 15:55:00 +01:00
mike12345567 6a51e58f73 Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 15:10:24 +01:00
mike12345567 0bbd45b413 Adding the ability to get all apps, with the status attached. 2021-05-19 15:09:57 +01:00
Andrew Kingston 2b5f5fb3e9 Remove placeholder features which we won't have in this release from user app list screen 2021-05-19 15:04:07 +01:00
Andrew Kingston b3b57c9a0e Fix general settings page not saving, fix analytics options 2021-05-19 15:03:50 +01:00
Andrew Kingston 445471efa7 Default org platform URL to localhost 2021-05-19 15:03:27 +01:00
Andrew Kingston 5de98bb672 Implement new admin get self endpoint, move auth store to the portal, and implement working password changing and name changing 2021-05-19 14:05:08 +01:00
Andrew Kingston ee04e4d944 Remove console.log 2021-05-19 13:20:18 +01:00
Andrew Kingston ba1ee6b033 Add modal to let users change their own password, without endpoint for now 2021-05-19 13:18:58 +01:00
Keviin Åberg Kultalahti 5d60a0b1f6 wire up force reset password action 2021-05-19 13:57:54 +02:00
Keviin Åberg Kultalahti 728bbe473a create Force Reset Password Modal 2021-05-19 13:24:28 +02:00
Andrew Kingston 5c8c663935 Fix spacing and make consistent in all portal pages 2021-05-19 11:07:14 +01:00
Andrew Kingston 550ea1a70d Add missing properties to first name and last name user schema 2021-05-19 11:06:57 +01:00
Keviin Åberg Kultalahti 01c1f0ce85 minor fixes 2021-05-19 11:55:23 +02:00
Keviin Åberg Kultalahti 8a0f2aaa8e Update user list to show correct status 2021-05-19 11:54:35 +02:00
Keviin Åberg Kultalahti 36b098bc73 add working development access toggle 2021-05-19 11:52:12 +02:00
Keviin Åberg Kultalahti cdc7e604e5 update function names on users store 2021-05-19 11:51:54 +02:00
Martin McKeaveney 8ceba79a12 activations 2021-05-19 10:46:47 +01:00
Andrew Kingston 8364ab91a2 Fix google SSO button not working in light theme 2021-05-19 10:40:45 +01:00
Andrew Kingston 27dfa40ec4 Add user first name and last name to backend table UI 2021-05-19 10:40:05 +01:00
Andrew Kingston a6e80da57f Fix spacing in manage user page and add first name and last name fields 2021-05-19 10:39:23 +01:00
Andrew Kingston c1f1c8d169 Add first name and last name to user schema and add modal to update names 2021-05-19 10:25:23 +01:00
Keviin Åberg Kultalahti 3080d0a8c4 adds UI elements for toggling builder access 2021-05-19 11:23:14 +02:00
Andrew Kingston f1a7f2a440 Merge branch 'next' of github.com:Budibase/budibase into user-app-list 2021-05-19 10:09:20 +01:00
Martin McKeaveney a781239632 Adding cron presets to automations 2021-05-18 22:20:41 +01:00
mike12345567 d40fb215f9 Adding the ability to create options based on CSV, this will use the import data to create options. 2021-05-18 22:14:27 +01:00
Martin McKeaveney c3dc5bae76 cron automation trigger end to end 2021-05-18 21:03:26 +01:00
Andrew Kingston 2745506fc9 Remove console.log 2021-05-18 19:14:18 +01:00
Andrew Kingston e136cee959 Fix initial role not being set when updating user role 2021-05-18 19:08:23 +01:00
Andrew Kingston 478ec4c090 Fix roles table showing tags with a label of undefined 2021-05-18 19:03:59 +01:00
Andrew Kingston 84510d0551 Use correct logo everywhere in the portal and fix some layouts 2021-05-18 18:48:37 +01:00
Andrew Kingston d00a412889 Fix logo upload and show current logo 2021-05-18 18:48:07 +01:00
Andrew Kingston e76f68cee3 Prevent rendering certain authenticated routes unless logged in, to avoid initial renders and onMount loaders firing 2021-05-18 15:29:34 +01:00
mike12345567 e9b9ada128 Building up the API interactions for the forgotten password flow. 2021-05-18 15:26:09 +01:00
mike12345567 6013cfd8ed Formatting. 2021-05-18 15:09:04 +01:00
mike12345567 3332e56842 Adding repeat password entry component. 2021-05-18 15:08:57 +01:00
Andrew Kingston 3b6b3877b1 Prevent access to create super admin screen once an admin has been created 2021-05-18 14:43:05 +01:00
Andrew Kingston 5daccbd76e Fix layout of create super admin page 2021-05-18 14:39:52 +01:00
Andrew Kingston 78ba798be2 Improve routing based on auth and roles, and use redirects rather than pushing new routes 2021-05-18 14:39:26 +01:00
Andrew Kingston 473c9ebfa6 Merge branch 'feature/forgot-password' of github.com:Budibase/budibase into user-app-list 2021-05-18 14:33:25 +01:00
mike12345567 608c798cb9 Merge branch 'next' of github.com:Budibase/budibase into feature/forgot-password 2021-05-18 14:29:43 +01:00
Andrew Kingston ec32354c7f Add initial work on user app list screen 2021-05-18 13:57:14 +01:00
Andrew Kingston 8f9b60a400 Fix first time app creation modal not being centered and flashing apps when loading the page 2021-05-18 13:56:05 +01:00
Andrew Kingston 59e70d96ad Allow app card rows to display all lock statuses 2021-05-18 13:55:15 +01:00
Andrew Kingston 89643ca407 Fix add user button style 2021-05-18 13:54:41 +01:00
Andrew Kingston e5d1d8c214 Add default budibase org details 2021-05-18 13:54:04 +01:00
mike12345567 9898287257 Adding in all the other routes needed for forgotten password flow. 2021-05-18 12:34:21 +01:00
Andrew Kingston 0251ee366f Merge branch 'next' of github.com:Budibase/budibase into user-app-list 2021-05-18 12:33:06 +01:00
Keviin Åberg Kultalahti 39d5e4ef45 Merge branch 'next' into admin/user-management-ui 2021-05-18 12:27:46 +02:00
Martin McKeaveney d9ed0686ab Merge pull request #1496 from Budibase/feature/draft-apps
Feature/draft apps
2021-05-18 11:25:51 +01:00
Keviin Åberg Kultalahti 038369f736 prettier format 2021-05-18 12:22:35 +02:00
Keviin Åberg Kultalahti 9f5e891b72 lint:fix 2021-05-18 12:21:57 +02:00
Keviin Åberg Kultalahti c66be3cebb adds a custom renderer to the users page 2021-05-18 12:17:57 +02:00
Andrew Kingston 8902a26ecc Disable update on change for component settings 2021-05-18 08:40:18 +01:00
Martin McKeaveney ee9a097979 lint 2021-05-17 21:43:50 +01:00
mike12345567 1c8dee192a Switching everything over to proper layouts and removing any specified margins/padding. 2021-05-17 18:20:10 +01:00
mike12345567 1e0482315b Switching over to use layouts. 2021-05-17 17:51:13 +01:00
mike12345567 43899cae68 Adding login form from designs. 2021-05-17 16:48:26 +01:00
Martin McKeaveney c32b52430e flip bool 2021-05-17 16:33:33 +01:00
Keviin Åberg Kultalahti 3844e119a8 remove accidental extra component 2021-05-17 16:38:41 +02:00
mike12345567 8a63a8d32e Further work towards login designs. 2021-05-17 15:29:57 +01:00
Keviin Åberg Kultalahti 52c7980e08 simplify fetching 2021-05-17 16:16:51 +02:00
Keviin Åberg Kultalahti b0265efb29 switch to using roles endpoint to get apps for roles page 2021-05-17 16:11:08 +02:00
mike12345567 e7e7687aae Merge branch 'feature/draft-apps' of github.com:Budibase/budibase into feature/forgot-password 2021-05-17 14:54:03 +01:00
Keviin Åberg Kultalahti 116ae6eeea Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:28:52 +02:00
Martin McKeaveney f1cd6d01e9 tidy up 2021-05-17 14:24:37 +01:00
Keviin Åberg Kultalahti 56e09c9b7b Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:21:48 +02:00
Keviin Åberg Kultalahti 4fb4372c1b remove unused import 2021-05-17 15:21:29 +02:00
mike12345567 3641ee5e2c Work in progress, moving login form around a bit. 2021-05-17 13:47:23 +01:00
Keviin Åberg Kultalahti 2eeb689b86 fix fetchData to start off as loading 2021-05-17 13:24:09 +02:00
Keviin Åberg Kultalahti 4d9e4ca426 fix not being able to update roles twice 2021-05-17 13:23:19 +02:00
Keviin Åberg Kultalahti 24d84ee2b4 fix erroneous import 2021-05-17 13:12:43 +02:00
Keviin Åberg Kultalahti d70e336574 adds updateRoles method to users store 2021-05-17 13:01:16 +02:00
Keviin Åberg Kultalahti 8e3bd36cc5 swap out random password method 2021-05-17 10:22:30 +02:00
Keviin Åberg Kultalahti 341b632736 Merge branch 'next' into admin/user-management-ui 2021-05-17 10:11:25 +02:00
Keviin Åberg Kultalahti 97cf6fc1fe wip: roles fetch 2021-05-17 10:10:51 +02:00
Martin McKeaveney fc7ddbe540 merge 2021-05-16 21:29:07 +01:00
Martin McKeaveney 0f2bcf581d revert functionality working 2021-05-16 21:25:37 +01:00