Commit Graph

845 Commits

Author SHA1 Message Date
mike12345567 c9a05b6f1b Fixing issue with users that don't have admin structure. 2021-05-21 17:19:13 +01:00
mike12345567 a39b633c90 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 3c650fad56 Merge branch 'master' of github.com:Budibase/budibase into fix/lockdown-admin 2021-05-21 16:54:52 +01:00
mike12345567 18cbb02bf9 Updating administration middleware so that internal requests allowed through automatically. 2021-05-21 16:43:01 +01:00
mike12345567 8ada416e65 Adding ability to create new admins. 2021-05-21 16:30:37 +01:00
Martin McKeaveney cb274d33ed remove superfluous copy 2021-05-21 16:02:49 +01:00
Martin McKeaveney 6dfe3f4df3
Merge pull request #1533 from Budibase/martin-fixes
WIP: fixes
2021-05-21 15:49:52 +01:00
Andrew Kingston 7f677f3d59
Merge pull request #1526 from Budibase/ak-fixes
AK fixes
2021-05-21 15:44:58 +01:00
Andrew Kingston fef5e4288d Revert login on enter 2021-05-21 15:44:27 +01:00
Andrew Kingston 805b09673a Change update self method to automatically merge new fields with existing user object 2021-05-21 15:23:39 +01:00
Martin McKeaveney a1b4f32318 Merge branch 'master' of https://github.com/Budibase/budibase into martin-fixes 2021-05-21 15:18:16 +01:00
Martin McKeaveney 2636c9450b simpler check using checklist 2021-05-21 14:55:11 +01:00
Martin McKeaveney 6a293df4be enter to login, google auth only show if configured 2021-05-21 14:45:56 +01:00
Andrew Kingston a8df26ffa6 Render email template inside iframe and render custom templates inside base template 2021-05-21 14:22:22 +01:00
Andrew Kingston ad81a526c1 Remove question mark from field label 2021-05-21 13:56:18 +01:00
Andrew Kingston 509ada35fc Fix styles of tag renderer to make it readable but remove hover state 2021-05-21 13:55:17 +01:00
Andrew Kingston eaaf3dfbca Fix small typo in user details page 2021-05-21 13:49:25 +01:00
Andrew Kingston 064c7a3124 Add readable labels to Google oauth fields 2021-05-21 13:46:13 +01:00
Andrew Kingston bc9e272978 Merge branch 'master' of github.com:Budibase/budibase into ak-fixes 2021-05-21 13:42:43 +01:00
Andrew Kingston a7790707fc Add repeat password input to admin user creation 2021-05-21 13:35:38 +01:00
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
Keviin Åberg Kultalahti fc4f0b6c77 Merge branch 'master' into fixes/user-management 2021-05-21 14:10:36 +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
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 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
Keviin Åberg Kultalahti 50091b9bb1 move ResetForm to page component 2021-05-21 12:09:38 +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
Andrew Kingston 04c32d95b0 Remove global search bar 2021-05-21 11:02:40 +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
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
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
Keviin Åberg Kultalahti fd74c07869 fix email templates being unreachable 2021-05-20 14:49:53 +02:00
Keviin Åberg Kultalahti 81726501ee Merge branch 'next' into fixes/user-management 2021-05-20 11:02:15 +02:00
Andrew Kingston 4d34fce56c Change password modal title to 'Update password' 2021-05-19 19:05:15 +01:00
Andrew Kingston 7db2a63a67 Fix app deletion not working 2021-05-19 18:45:43 +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 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 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
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
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
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
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 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 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 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 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 725b32b9b1 Fix add user button style 2021-05-18 13:54:41 +01:00
mike12345567 1080708ed5 Adding in all the other routes needed for forgotten password flow. 2021-05-18 12:34:21 +01:00
Keviin Åberg Kultalahti e838950777 Merge branch 'next' into admin/user-management-ui 2021-05-18 12:27:46 +02:00
Keviin Åberg Kultalahti adc701171f prettier format 2021-05-18 12:22:35 +02:00
Keviin Åberg Kultalahti 07dfc43d11 adds a custom renderer to the users page 2021-05-18 12:17:57 +02:00
Martin McKeaveney d5fb542589 lint 2021-05-17 21:43:50 +01:00
Martin McKeaveney a4e83c25a4 flip bool 2021-05-17 16:33:33 +01:00
Keviin Åberg Kultalahti c676d6545d remove accidental extra component 2021-05-17 16:38:41 +02: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
Keviin Åberg Kultalahti afa76615ee Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:28:52 +02:00
Martin McKeaveney 15cc048280 tidy up 2021-05-17 14:24:37 +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
Keviin Åberg Kultalahti be543d6e3b fix not being able to update roles twice 2021-05-17 13:23:19 +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 f7c05d0631 wip: roles fetch 2021-05-17 10:10:51 +02:00
Martin McKeaveney 0ed0550e73 revert functionality working 2021-05-16 21:25:37 +01:00
Keviin Åberg Kultalahti 8392a4ba38 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:32:08 +02:00
Keviin Åberg Kultalahti 2908418267 update settings page text 2021-05-14 17:03:47 +02:00
mike12345567 2d0122f7d6 A general re-work of some parts of the auth lib, as well as moving roles/permissions around to make it possible to build an admin API which has role knowledge. 2021-05-14 15:43:41 +01:00
Keviin Åberg Kultalahti a08f2cb31f switches input to search component 2021-05-14 15:49:57 +02:00
Keviin Åberg Kultalahti 3de8a70b6d move email page into the manage subsection 2021-05-14 15:41:15 +02:00
Keviin Åberg Kultalahti cdb5d6a6bb adds notifications to roles updating action 2021-05-14 15:14:37 +02:00
Keviin Åberg Kultalahti 132dd2cbe0 adds frontend for updating roles of a user 2021-05-14 15:03:58 +02:00
Martin McKeaveney e8661a1ab7 publish button 2021-05-13 17:33:31 +01:00
Martin McKeaveney 0ee83a2e60 set up live replication between prod and dev instances 2021-05-13 17:24:32 +01:00
Martin McKeaveney 2582882188 fix response status from lock release call 2021-05-13 14:29:27 +01:00
Martin McKeaveney 31901c89f8 merge, UI for managing your own app locks 2021-05-13 14:04:03 +01:00
mike12345567 f4e3e1d196 Altering object store so that all writes/reads to the object store have the dev app prefix replaced with standard app. 2021-05-13 13:29:53 +01:00
Martin McKeaveney c3e1b1d302 lock concept in UI, make dev links go to builder and prod links go to real apps 2021-05-13 12:39:35 +01:00
mike12345567 71b0fc8f40 Formatting. 2021-05-13 12:32:18 +01:00
Martin McKeaveney 61a5b109f5 dev mode E2E 2021-05-13 11:06:08 +01:00
Keviin Åberg Kultalahti a31b8cbdbf fix broken settings page 2021-05-12 17:16:31 +02:00
Keviin Åberg Kultalahti 46ac4b43a1 hook up logo upload 2021-05-12 14:43:36 +02:00
Keviin Åberg Kultalahti 0da5247a03 Merge branch 'next' into admin/user-management-ui 2021-05-12 14:08:58 +02:00
Keviin Åberg Kultalahti 8179b96f4d add wip file upload 2021-05-12 14:08:44 +02:00
mike12345567 fed94bea70 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 12:49:42 +01:00
Martin McKeaveney 0937e39940 remove redundant handler 2021-05-12 11:51:03 +01:00
Keviin Åberg Kultalahti c843e17b31 invite flow now working 2021-05-12 12:49:14 +02:00
Keviin Åberg Kultalahti 982844092d stops redirect from builder/invite if not authed 2021-05-12 11:44:47 +02:00
Keviin Åberg Kultalahti ea342c3e5e sets up invite action in onboarding modal 2021-05-12 11:33:04 +02:00
Keviin Åberg Kultalahti 1ea4a9d850 correct notification message 2021-05-12 11:15:51 +02:00
Keviin Åberg Kultalahti 1a8fa817d5 enables functionality to delete users from frontend 2021-05-12 11:08:21 +02:00
Keviin Åberg Kultalahti a3b44caa37 adds create user flow 2021-05-12 11:00:18 +02:00
Keviin Åberg Kultalahti 431a3e5929 remove log statements 2021-05-12 10:30:58 +02:00
Keviin Åberg Kultalahti 10ba5610e6 correct error and touched states for buttons 2021-05-12 09:55:33 +02:00
Keviin Åberg Kultalahti cb0c6bac07 move logic from Users page to separate component 2021-05-12 09:13:59 +02:00
Keviin Åberg Kultalahti 6fc910afc3 fix userId import 2021-05-12 09:13:38 +02:00
Keviin Åberg Kultalahti f075b6ee07 cleanup top layout file 2021-05-12 09:13:25 +02:00
Martin McKeaveney bf0687d2a8 tidy up 2021-05-11 19:54:01 +01:00
mike12345567 c9d903a92f General cleanup, doing away with the concept of hosting in the builder and the generally confusing difference between cloud, self hosting and running locally - server is simply always a server now. 2021-05-11 17:49:26 +01:00
Keviin Åberg Kultalahti 5add018eea updates AddUserModal to use new validator 2021-05-11 18:03:43 +02:00
mike12345567 5230dcd3ac Formatting. 2021-05-11 15:24:17 +01:00
Martin McKeaveney 3bf3fc5e02 email template E2E, adding preview 2021-05-11 14:44:43 +01:00
Keviin Åberg Kultalahti bf50ed2304 Merge branch 'next' into admin/user-management-ui 2021-05-11 12:01:31 +02:00
Andrew Kingston 14c0bfbdcb Increase width of filter dropdown so that it doesn't overflow when the wrong font is used 2021-05-10 17:39:14 +01:00
Keviin Åberg Kultalahti deb8d77929 adds notifications to users pages 2021-05-10 17:42:23 +02:00
Andrew Kingston 0c53e3bc39 Add empty state to apps screen 2021-05-10 16:15:00 +01:00
Martin McKeaveney 5ae9b46226 lint 2021-05-10 14:50:37 +01:00
Martin McKeaveney 27498a4926 edit template HTML in modal 2021-05-10 14:47:16 +01:00
Martin McKeaveney b415fb2089 pull template type from body instead of params 2021-05-10 14:41:52 +01:00
Andrew Kingston b3877a5031 Properly key each app card 2021-05-10 12:36:32 +01:00
Andrew Kingston 3e287a0331 Simplify app layout and add option to delete apps 2021-05-10 12:28:54 +01:00
Martin McKeaveney a207137c92 editor styling 2021-05-10 12:06:31 +01:00
Andrew Kingston 2bf2045a0a Add non-gallery option to dropzeon and update create app modal 2021-05-10 11:53:32 +01:00
Keviin Åberg Kultalahti 8aeb1654ff adds warning prop to ModalContent to enable warning buttons 2021-05-07 14:56:27 +02:00
Keviin Åberg Kultalahti aef14aa35d adds users, user page and add user modal 2021-05-07 14:53:20 +02:00
Andrew Kingston e6e47a6d03 Add table app list view 2021-05-07 13:13:51 +01:00
Keviin Åberg Kultalahti 964ce5cab9 adds separate Basic Onboarding modal 2021-05-07 13:58:14 +02:00
Keviin Åberg Kultalahti 3ba439452d enables front-end search of users 2021-05-07 13:24:07 +02:00
Keviin Åberg Kultalahti 45c49872e6 merge fixes 2021-05-07 12:16:09 +02:00
Keviin Åberg Kultalahti c2bae6da4f Merge branch 'app-list' into admin/user-management-ui 2021-05-07 12:15:58 +02:00
Andrew Kingston 1158276bc6 Bump svelte and routify deps, fix builder _reset usage and some tidy ups 2021-05-07 11:14:43 +01:00
Keviin Åberg Kultalahti f440b32b83 Merge branch 'next' into admin/user-management-ui 2021-05-07 09:47:45 +02:00
Keviin Åberg Kultalahti 43973887b2 adds users store and moves some components 2021-05-07 09:47:05 +02:00
Andrew Kingston 9f39690eb1 Server builder under /builder rather than /app for top level to avoid confusion 2021-05-07 08:17:21 +01:00
Andrew Kingston f173d16695 Make pages scrollable 2021-05-07 07:56:56 +01:00
Andrew Kingston 6a90f8cecb Improve app list styles 2021-05-06 22:28:50 +01:00
Martin McKeaveney 1b1d45756b pulling app list, re-adding code for automation blocks and external data source block lost in merge 2021-05-06 18:31:03 +01:00
Martin McKeaveney cb2b1037ba SMTP and template management E2E 2021-05-06 18:02:44 +01:00
Andrew Kingston 4160dc1e8d Update routing to serve any builder routes under /app so that envoy can proxy correctly 2021-05-06 16:39:34 +01:00
Andrew Kingston daf58ff554 Update portal pages to have better usage of spectrum components 2021-05-06 15:34:22 +01:00
Andrew Kingston db9f3d15d1 Add log out and old settings to action menu from top bar avatar 2021-05-06 15:00:35 +01:00
Andrew Kingston e29df9f45c Tidy up auth logic in routes 2021-05-06 14:52:20 +01:00
Andrew Kingston ba65dfd718 Handle auth in top level routes and redirect as required. Change default route to be portal 2021-05-06 14:49:11 +01:00
Andrew Kingston 8cde453e61 Delete old builder layout page 2021-05-06 14:47:41 +01:00
Andrew Kingston 627d41de85 Add new auth page to handle login and future work on reset password etc 2021-05-06 14:47:21 +01:00
Andrew Kingston 37ba425bf1 Fix app card text size and bug with global css rule 2021-05-06 14:16:17 +01:00
Andrew Kingston 700df23e78 Touch up admin user creation to match designs 2021-05-06 14:11:06 +01:00
Andrew Kingston 760733f071 Merge branch 'next' of github.com:Budibase/budibase into app-list 2021-05-06 14:01:03 +01:00
Andrew Kingston 69345b0c01 Move app list to admin portal 2021-05-06 13:59:06 +01:00
Keviin Åberg Kultalahti 1d9387ebeb wip: skeleton for users page 2021-05-06 14:34:41 +02:00
Martin McKeaveney 23cb160a69 merge with next 2021-05-06 11:56:53 +01:00
Keviin Åberg Kultalahti 3d4fef4376 Merge branch 'next' into admin/user-management-ui 2021-05-06 12:56:46 +02:00
Martin McKeaveney 2fe2d521cf lint 2021-05-06 10:57:24 +01:00
Martin McKeaveney 91bf0d7a98 budibase config checklist complete 2021-05-06 10:28:06 +01:00
Andrew Kingston 99a02eb94d Add skeleton for apps page as example of full width page 2021-05-06 10:22:36 +01:00
Andrew Kingston e576e464e2 Update existing pages to use Page layout component 2021-05-06 10:22:17 +01:00
Andrew Kingston efdac8bc66 Add default portal redirect 2021-05-06 10:18:41 +01:00
Andrew Kingston 61d81a719a Update core layout to allow full width pages and match designs 2021-05-06 10:18:25 +01:00
Keviin Åberg Kultalahti b3addde600 add manage subroute to host users, auth, email pages 2021-05-06 11:00:41 +02:00
Martin McKeaveney 32608eee45 merge 2021-05-06 09:17:05 +01:00
Martin McKeaveney 1aedba80bd first time setup E2E 2021-05-05 21:56:43 +01:00
Martin McKeaveney 4377b41f40 endpoint for budibase configuration checklist 2021-05-05 20:58:31 +01:00
Martin McKeaveney 0525be382d basic UI for creating first admin user 2021-05-05 17:58:09 +01:00
Keviin Åberg Kultalahti 8d02e017df remove unneeded class 2021-05-05 18:45:18 +02:00
Keviin Åberg Kultalahti f84389c2e1 remove some unneeded after fixing _layout 2021-05-05 18:44:55 +02:00
Keviin Åberg Kultalahti 22885f185a fix merge conflict 2021-05-05 18:42:50 +02:00
Keviin Åberg Kultalahti 335aeeded4 format fixes 2021-05-05 18:41:42 +02:00
Keviin Åberg Kultalahti 141ab61828 merge next 2021-05-05 18:40:55 +02:00
Keviin Åberg Kultalahti a86961085f add analytics toggling 2021-05-05 18:39:36 +02:00
Keviin Åberg Kultalahti 31ed79c4e7 update org store and add loading state + notifications to save action 2021-05-05 18:30:03 +02:00
Martin McKeaveney c381f08b4a fix styling 2021-05-05 17:21:35 +01:00
Keviin Åberg Kultalahti e999f53291 introduces portal stores concept and adds an org one that handles configs 2021-05-05 17:50:45 +02:00
Martin McKeaveney a658b2917c Merge branch 'next' of https://github.com/Budibase/budibase into oauth-config-screen 2021-05-05 14:54:12 +01:00
Keviin Åberg Kultalahti 7a346bed29 move settings to a subpath 2021-05-05 12:56:12 +02:00
Martin McKeaveney 4e494b23c9 tidy up imports 2021-05-05 11:03:45 +01:00