1
0
Fork 0
mirror of synced 2024-07-01 20:41:03 +12:00
Commit graph

5656 commits

Author SHA1 Message Date
Andrew Kingston c3daa8bc61 Update user avatar to use correct initials 2021-05-21 13:17:45 +01:00
Andrew Kingston 1b56560cea Fix issue on hot reload when user object was null 2021-05-21 13:17:35 +01:00
Andrew Kingston 4b106ace56 Derive initials from user names and email address 2021-05-21 13:17:09 +01:00
Andrew Kingston ce71ce1041 Update avatar to take initials prop and render text as uppercase 2021-05-21 13:16:54 +01:00
mike12345567 a0b0ddf0cf Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at 2021-05-21 13:16:49 +01:00
Keviin Åberg Kultalahti fc4f0b6c77 Merge branch 'master' into fixes/user-management 2021-05-21 14:10:36 +02:00
mike12345567 9531252f41 Adding redis to exclusion from coverage (can't currently test). 2021-05-21 13:08:59 +01:00
mike12345567 f56250824c Adding a debounced updated at timestamp to applications. 2021-05-21 13:07:10 +01:00
Andrew Kingston 65c1d43f5e
Merge pull request #1516 from Budibase/enhanced-app-list
Enhanced app list + placeholder removal
2021-05-21 13:03:36 +01:00
Keviin Åberg Kultalahti 683ae48caa lint fix 2021-05-21 13:43:27 +02:00
Keviin Åberg Kultalahti 31968556ad fix login page 2021-05-21 13:33:05 +02:00
Keviin Åberg Kultalahti 093e52a4b7 Merge branch 'master' into fixes/user-management 2021-05-21 13:32:55 +02:00
Martin McKeaveney e8e4ee3da0
Merge pull request #1508 from Budibase/postgres-connection-pool
postgres connection pooling
2021-05-21 12:28:51 +01:00
Keviin Åberg Kultalahti 7c7c9ac743 move extracted components into page components 2021-05-21 13:26:55 +02:00
Keviin Åberg Kultalahti 06c9af9670 fix erroneous disable state in resetform 2021-05-21 13:25:40 +02:00
Andrew Kingston 7cda131279 Simplify lock logic 2021-05-21 11:49:23 +01:00
Andrew Kingston 9d9d791999 Update normal user home screen to reflect changes with app fetching 2021-05-21 11:17:23 +01:00
Andrew Kingston ddd7608f95 Remove accidental text 2021-05-21 11:15:35 +01:00
Andrew Kingston b6026b61e8 Merge branch 'master' of github.com:Budibase/budibase into enhanced-app-list 2021-05-21 11:11:43 +01:00
Michael Drury 34384e476c
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 3593073c00 change forceReset bool name 2021-05-21 12:10:02 +02:00
Keviin Åberg Kultalahti 50091b9bb1 move ResetForm to page component 2021-05-21 12:09:38 +02:00
Keviin Åberg Kultalahti 7a00153848 add check after Login to redirect to resetpassword 2021-05-21 12:09:10 +02:00
Keviin Åberg Kultalahti f6f6949d9e add force reset modal 2021-05-21 12:08:31 +02:00
Keviin Åberg Kultalahti 7888578d91 add forceResetPassword check to layout 2021-05-21 12:08:18 +02:00
mike12345567 112ed8b3fa Linting. 2021-05-21 11:06:57 +01:00
Andrew Kingston 04c32d95b0 Remove global search bar 2021-05-21 11:02:40 +01:00
Andrew Kingston 0ea2482f7b Merge branch 'master' of github.com:Budibase/budibase into enhanced-app-list 2021-05-21 11:00:26 +01:00
Andrew Kingston e1ac3cd5d2 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 133dee8eba Improve app list empty state screen and fix order of app context menu options 2021-05-21 10:37:19 +01:00
Andrew Kingston c45e75f8b5 Update app list screen to show unified app list with publish status 2021-05-21 10:32:16 +01:00
Andrew Kingston 70e08d6a15 Add StatusLight and Badge components to BBUI 2021-05-21 10:31:45 +01:00
Martin McKeaveney 5ee5cafd48 v0.9.1 2021-05-21 10:04:45 +01:00
Martin McKeaveney fe5df57935 removing skip_setup as it was preventing init 2021-05-20 21:42:27 +01:00
mike12345567 a8ab7858b7 Formatting. 2021-05-20 20:48:46 +01:00
mike12345567 fba63134d1 Fixing some issues found when testing. 2021-05-20 20:48:24 +01:00
mike12345567 d1fa6dbdc6 Merge branch 'fix/per-app-login' of github.com:Budibase/budibase into fix/per-app-login 2021-05-20 16:18:32 +01:00
mike12345567 69a54aad83 Fixing test cases. 2021-05-20 16:18:09 +01:00
Keviin Åberg Kultalahti eaa2821e75 fix bug when switching between tabs 2021-05-20 16:57:38 +02:00
Keviin Åberg Kultalahti 302e001eb5 workaround to strange onMount bug with many Tabs components 2021-05-20 16:46:20 +02:00
Andrew Kingston 9cb06b296a Add return URL's to any unauthenticated requests in the portal or builder 2021-05-20 15:01:59 +01:00
Andrew Kingston cf5e91c431 Redirect away from auth routes if already authenticated 2021-05-20 15:01:34 +01:00
Keviin Åberg Kultalahti 8bb8fdfb18 remove unused var 2021-05-20 15:59:08 +02:00
Martin McKeaveney 7b4cc64bee v0.9.1 2021-05-20 14:53:22 +01:00
Martin McKeaveney d1836a898c v0.9.0 2021-05-20 14:49:19 +01:00
Andrew Kingston e7e2a81d98 Add return URL to login form 2021-05-20 14:47:36 +01:00
Andrew Kingston d0fc934ff7 Redirect to login from client apps when required 2021-05-20 14:47:17 +01:00
Keviin Åberg Kultalahti aaa2433af6 fix not being able to navigate directly to email template 2021-05-20 15:39:21 +02:00
Keviin Åberg Kultalahti e8969f395a remove unused imports 2021-05-20 15:13:16 +02:00
Keviin Åberg Kultalahti 772b612db4 remove transitions because of bug 2021-05-20 15:13:08 +02:00
Keviin Åberg Kultalahti f421d7ba17 fixes layout issues in email templates 2021-05-20 15:03:34 +02:00
Martin McKeaveney d77ea74020 simplify docker build before push 2021-05-20 13:54:18 +01:00
Keviin Åberg Kultalahti fd74c07869 fix email templates being unreachable 2021-05-20 14:49:53 +02:00
Keviin Åberg Kultalahti 24c56a89ec fixes missing cursor styling 2021-05-20 14:34:19 +02:00
Keviin Åberg Kultalahti e0f22ae934 Merge branch 'master' into fixes/user-management 2021-05-20 14:12:48 +02:00
Martin McKeaveney 79d5fbeaea fix lint 2021-05-20 13:09:02 +01:00
mike12345567 beae1cec71 Removing all login/logout functionality from apps. 2021-05-20 13:05:58 +01:00
Martin McKeaveney e655f23edd merge 2021-05-20 12:41:54 +01:00
mike12345567 0b08a78f87 Fixing an issue with checkAuth function not checking response status before attempting to get JSON. 2021-05-20 12:39:33 +01:00
mike12345567 3e92311101 Cleanup after testing/looking through hosting files. 2021-05-20 12:21:58 +01:00
mike12345567 53d5480aad Fixing automation test case. 2021-05-20 12:07:07 +01:00
mike12345567 e15137b37d Merge branch 'master' of github.com:Budibase/budibase into fix/onboarding 2021-05-20 11:56:19 +01:00
Martin McKeaveney 0b3110b223 merge with master 2021-05-20 10:40:15 +01:00
Martin McKeaveney e71a51ae65 fix analytics code 2021-05-20 10:26:23 +01:00
Keviin Åberg Kultalahti 6d8dc4ff56 yarn lock 2021-05-20 11:02:29 +02:00
Keviin Åberg Kultalahti 81726501ee Merge branch 'next' into fixes/user-management 2021-05-20 11:02:15 +02:00
Mike Shanks 94d098e494 Fix: Unable to use parameters with Rest conenctor 2021-05-20 09:07:51 +01:00
Andrew Kingston 13b3133c31
Merge pull request #1505 from Budibase/user-app-list
User home screen + tidy ups
2021-05-20 08:41:44 +01:00
Martin McKeaveney ed6c1101bc hard coding posthog api key 2021-05-19 21:41:56 +01:00
Martin McKeaveney 2761eaed2d postgres connection pooling 2021-05-19 20:58:59 +01:00
Martin McKeaveney e6548a6c92
Merge pull request #1503 from Budibase/cron
Cron Automation trigger
2021-05-19 19:33:49 +01:00
Andrew Kingston 4d34fce56c Change password modal title to 'Update password' 2021-05-19 19:05:15 +01:00
Andrew Kingston da0bfd8b47 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 7db2a63a67 Fix app deletion not working 2021-05-19 18:45:43 +01:00
Andrew Kingston c911e67629 Remove unused prop 2021-05-19 18:45:14 +01:00
mike12345567 584f7c2403 Fixing worker test cases. 2021-05-19 16:39:17 +01:00
mike12345567 0db486d4e8 Formatting. 2021-05-19 16:24:50 +01:00
mike12345567 ed63d1d8f2 Updating user test cases. 2021-05-19 16:24:20 +01:00
mike12345567 ecc1527833 Merge branch 'next' of github.com:Budibase/budibase into user-app-list 2021-05-19 15:58:17 +01:00
mike12345567 8c68f1c134 Fixing issues with the user table within the apps. 2021-05-19 15:55:00 +01:00
mike12345567 dbf8e426bc Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 15:10:24 +01:00
mike12345567 6d6eee2a93 Adding the ability to get all apps, with the status attached. 2021-05-19 15:09:57 +01:00
Andrew Kingston c3b462aea1 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 230372dba2 Fix general settings page not saving, fix analytics options 2021-05-19 15:03:50 +01:00
Andrew Kingston feb71dc844 Default org platform URL to localhost 2021-05-19 15:03:27 +01:00
Andrew Kingston 66fd0d0016 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 ae0f707e6a Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:38:21 +01:00
mike12345567 af531241c4 Adding a get self endpoint in the global users. 2021-05-19 13:37:59 +01:00
Andrew Kingston 3bd5da084c Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:31:27 +01:00
mike12345567 31d3566626 Allowing null for global user endpoint properties. 2021-05-19 13:30:55 +01:00
Andrew Kingston d166de11ed Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:23:51 +01:00
mike12345567 14b62b8aed Removing admin middleware applying to everything. 2021-05-19 13:22:05 +01:00
Andrew Kingston 6209d73abf Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:20:41 +01:00
Andrew Kingston 54123d2f23 Remove console.log 2021-05-19 13:20:18 +01:00
Andrew Kingston 053af1becb Add modal to let users change their own password, without endpoint for now 2021-05-19 13:18:58 +01:00
mike12345567 8e10b42f9c Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:18:38 +01:00
mike12345567 1956d9765e Adding admin only endpoint, removing the ability to create/delete global users from the app server and adding a global self user update. 2021-05-19 13:17:50 +01:00
Keviin Åberg Kultalahti 347650e49d wire up force reset password action 2021-05-19 13:57:54 +02:00
Keviin Åberg Kultalahti d74f47e227 create Force Reset Password Modal 2021-05-19 13:24:28 +02:00
Keviin Åberg Kultalahti 06af8e70e6 add forcePasswordReset bool to user object validation 2021-05-19 13:24:14 +02:00
mike12345567 ed4455b450 Fixing test cases. 2021-05-19 11:27:19 +01:00
Andrew Kingston 664ee94433 Fix spacing and make consistent in all portal pages 2021-05-19 11:07:14 +01:00
Andrew Kingston 2cc37e196d Add missing properties to first name and last name user schema 2021-05-19 11:06:57 +01:00
Martin McKeaveney 2683b2c03a remove outputs from cron 2021-05-19 10:57:02 +01:00
Keviin Åberg Kultalahti b687171abb minor fixes 2021-05-19 11:55:23 +02:00
Keviin Åberg Kultalahti f852e8657a Update user list to show correct status 2021-05-19 11:54:35 +02:00
Keviin Åberg Kultalahti 7d8bb8d3bb add working development access toggle 2021-05-19 11:52:12 +02:00
Keviin Åberg Kultalahti 538b51b660 update function names on users store 2021-05-19 11:51:54 +02:00
Martin McKeaveney 775fd10b6f activations 2021-05-19 10:46:47 +01:00
Andrew Kingston 1c84cacc59 Fix google SSO button not working in light theme 2021-05-19 10:40:45 +01:00
Andrew Kingston 10c8c569f8 Add user first name and last name to backend table UI 2021-05-19 10:40:05 +01:00
Andrew Kingston 1e595cb452 Fix spacing in manage user page and add first name and last name fields 2021-05-19 10:39:23 +01:00
Andrew Kingston c62b002182 Update Layout to be position relative 2021-05-19 10:36:39 +01:00
Andrew Kingston 9575020b1e 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 22db93394c adds UI elements for toggling builder access 2021-05-19 11:23:14 +02:00
Andrew Kingston 6e5cfe8520 Merge branch 'next' of github.com:Budibase/budibase into user-app-list 2021-05-19 10:09:20 +01:00
Andrew Kingston 54d16a3bf3 Remove margin in BBUI body component 2021-05-19 09:02:51 +01:00
Martin McKeaveney 50701c74f4 Adding cron presets to automations 2021-05-18 22:20:41 +01:00
mike12345567 48b7a31c2a 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 4b77c75cbb cron automation trigger end to end 2021-05-18 21:03:26 +01:00
Andrew Kingston 2028560a90 Remove console.log 2021-05-18 19:14:18 +01:00
Andrew Kingston 9cdd519a8a Fix initial role not being set when updating user role 2021-05-18 19:08:23 +01:00
Andrew Kingston ac3edb2f60 Fix roles table showing tags with a label of undefined 2021-05-18 19:03:59 +01:00
Andrew Kingston bf935183ce Use correct logo everywhere in the portal and fix some layouts 2021-05-18 18:48:37 +01:00
Andrew Kingston 3222559544 Fix logo upload and show current logo 2021-05-18 18:48:07 +01:00
Andrew Kingston 190186c990 Allow dropzone to preview images before being uploaded 2021-05-18 18:47:39 +01:00
mmckeaveney 7c3b3f78a7 groundwork for cron automation trigger 2021-05-18 15:37:54 +00:00
mike12345567 b8e08b455d Updating text align style to be optional. 2021-05-18 16:03:06 +01:00
mike12345567 298e5c7e4d Updating reset link to match that of the builder. 2021-05-18 15:48:28 +01:00
Andrew Kingston 0ad8eb95e2 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 d9439abe86 Building up the API interactions for the forgotten password flow. 2021-05-18 15:26:09 +01:00
mike12345567 46d572a8fc Formatting. 2021-05-18 15:09:04 +01:00
mike12345567 6e858d2bbd Adding repeat password entry component. 2021-05-18 15:08:57 +01:00
Andrew Kingston 05d1816814 Prevent access to create super admin screen once an admin has been created 2021-05-18 14:43:05 +01:00
Andrew Kingston 0006151737 Fix layout of create super admin page 2021-05-18 14:39:52 +01:00
Andrew Kingston 62ed55ac14 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 72e8af600a Merge branch 'feature/forgot-password' of github.com:Budibase/budibase into user-app-list 2021-05-18 14:33:25 +01:00
mike12345567 faa4606fe7 Merge branch 'next' of github.com:Budibase/budibase into feature/forgot-password 2021-05-18 14:29:43 +01:00
Andrew Kingston e239e9f434 Add initial work on user app list screen 2021-05-18 13:57:14 +01:00
Andrew Kingston c9e4d74846 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 7fb40cd7ad Allow app card rows to display all lock statuses 2021-05-18 13:55:15 +01:00
Andrew Kingston 725b32b9b1 Fix add user button style 2021-05-18 13:54:41 +01:00
Andrew Kingston 6a418ecd51 Add default budibase org details 2021-05-18 13:54:04 +01:00
Andrew Kingston 4f0f532b72 Add font weight property to BBUI layout body 2021-05-18 13:52:42 +01:00
Andrew Kingston 1c56e9502d Ensure layout page component always fills the page 2021-05-18 13:52:26 +01:00
mike12345567 1080708ed5 Adding in all the other routes needed for forgotten password flow. 2021-05-18 12:34:21 +01:00
Andrew Kingston 4085cae433 Merge branch 'next' of github.com:Budibase/budibase into user-app-list 2021-05-18 12:33:06 +01:00
Keviin Åberg Kultalahti e838950777 Merge branch 'next' into admin/user-management-ui 2021-05-18 12:27:46 +02:00
Martin McKeaveney dbabe0afaf
Merge pull request #1496 from Budibase/feature/draft-apps
Feature/draft apps
2021-05-18 11:25:51 +01:00
Keviin Åberg Kultalahti adc701171f prettier format 2021-05-18 12:22:35 +02:00
Keviin Åberg Kultalahti a3f5e1af8c lint:fix 2021-05-18 12:21:57 +02:00
Keviin Åberg Kultalahti 7fa0666cae updates invite url 2021-05-18 12:18:06 +02:00
Keviin Åberg Kultalahti 07dfc43d11 adds a custom renderer to the users page 2021-05-18 12:17:57 +02:00
Andrew Kingston ac2c34a4b4 Disable update on change for component settings 2021-05-18 08:40:18 +01:00
Andrew Kingston ea1583478a Add ability for BBUI text fields to update on change and default to true 2021-05-18 08:37:07 +01:00
Andrew Kingston bda46f3cf2 Fix issue with switches and checkboxes on firefox on linux 2021-05-18 08:20:46 +01:00
Martin McKeaveney d5fb542589 lint 2021-05-17 21:43:50 +01:00
mike12345567 3f7adae0d5 Switching everything over to proper layouts and removing any specified margins/padding. 2021-05-17 18:20:10 +01:00
mike12345567 47c4366a8f Switching over to use layouts. 2021-05-17 17:51:13 +01:00
Andrew Kingston a26ab57a76 Add option for text alignment to Body 2021-05-17 17:49:40 +01:00
Andrew Kingston c90463e6a3 Add option to layout to justify items 2021-05-17 17:42:12 +01:00
mike12345567 4bbeec5954 Adding login form from designs. 2021-05-17 16:48:26 +01:00
Martin McKeaveney 96142c91cd Merge branch 'feature/draft-apps' of https://github.com/Budibase/budibase into feature/draft-apps 2021-05-17 16:43:35 +01:00
Martin McKeaveney a4e83c25a4 flip bool 2021-05-17 16:33:33 +01:00
Keviin Åberg Kultalahti 71929dadd1 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 16:41:46 +02:00
Keviin Åberg Kultalahti c676d6545d remove accidental extra component 2021-05-17 16:38:41 +02:00
mike12345567 eb2b9d0eab Merge branch 'feature/draft-apps' of github.com:Budibase/budibase into feature/forgot-password 2021-05-17 15:32:03 +01:00
mike12345567 eb4a430a7c Updating templating bindings enumerations. 2021-05-17 15:30:24 +01:00
mike12345567 75b1c25199 Further work towards login designs. 2021-05-17 15:29:57 +01:00
Keviin Åberg Kultalahti 69471a42ce simplify fetching 2021-05-17 16:16:51 +02:00
Keviin Åberg Kultalahti 50a7138486 switch to using roles endpoint to get apps for roles page 2021-05-17 16:11:08 +02:00
mike12345567 1cb4387fc8 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 447a592ddb Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:53:32 +02:00
mike12345567 df7828d3af don't use the _id prop of the app metadata. 2021-05-17 14:52:49 +01:00
Keviin Åberg Kultalahti b8870ed8c4 erge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:29:33 +02:00
mike12345567 dd61b0734f Merge branch 'feature/draft-apps' of github.com:Budibase/budibase into feature/draft-apps 2021-05-17 14:28:56 +01:00
Keviin Åberg Kultalahti afa76615ee Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:28:52 +02:00
mike12345567 cbc2066d91 Updating roles API further so find API works too. 2021-05-17 14:28:41 +01:00
Martin McKeaveney 15cc048280 tidy up 2021-05-17 14:24:37 +01:00
mike12345567 19b1310c60 Merge branch 'feature/draft-apps' of github.com:Budibase/budibase into feature/draft-apps 2021-05-17 14:24:36 +01:00
Keviin Åberg Kultalahti 5a7ac2287b Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:21:48 +02:00
Keviin Åberg Kultalahti 349f19cc57 remove unused import 2021-05-17 15:21:29 +02:00
mike12345567 dd4a963c3e Updating role system to never think about the dev app. 2021-05-17 14:20:19 +01:00
mike12345567 db87d1d621 Work in progress, moving login form around a bit. 2021-05-17 13:47:23 +01:00
Keviin Åberg Kultalahti ab24ecc406 fix fetchData to start off as loading 2021-05-17 13:24:09 +02:00
Keviin Åberg Kultalahti 6f53922ad3 remove unused prop in ModalContent 2021-05-17 13:23:59 +02:00
Keviin Åberg Kultalahti be543d6e3b fix not being able to update roles twice 2021-05-17 13:23:19 +02:00
Keviin Åberg Kultalahti e12ba0fa38 fix erroneous import 2021-05-17 13:12:43 +02:00
Keviin Åberg Kultalahti 0104a7a1ff adds updateRoles method to users store 2021-05-17 13:01:16 +02:00
Keviin Åberg Kultalahti 3c58559763 swap out random password method 2021-05-17 10:22:30 +02:00
Keviin Åberg Kultalahti 0b89117225 remove unneeded prop 2021-05-17 10:22:15 +02:00
Keviin Åberg Kultalahti 913fbcc990 Merge branch 'next' into admin/user-management-ui 2021-05-17 10:11:25 +02:00
Keviin Åberg Kultalahti f7c05d0631 wip: roles fetch 2021-05-17 10:10:51 +02:00
Andrew Kingston bdca01e7d8 Use POST requests with JSON bodies for searching instead of GETs with query string params 2021-05-17 08:16:04 +01:00
Martin McKeaveney 6dc288fcc3 merge 2021-05-16 21:29:07 +01:00
Martin McKeaveney 0ed0550e73 revert functionality working 2021-05-16 21:25:37 +01:00
Keviin Åberg Kultalahti 771467fba1 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:49:09 +02:00
mike12345567 0234d11110 Making sure routes are included. 2021-05-14 16:47:47 +01:00
mike12345567 ac0f620b38 Formatting. 2021-05-14 16:32:51 +01:00
Keviin Åberg Kultalahti 8392a4ba38 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:32:08 +02:00