Commit Graph

3489 Commits

Author SHA1 Message Date
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 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
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 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
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
mike12345567 4bbeec5954 Adding login form from designs. 2021-05-17 16:48:26 +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
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 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
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 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 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
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 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 819582310a lint fixes 2021-05-14 16:09:07 +02: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 3873ed32b5 adds dummy updateRoles functioon to users store 2021-05-14 15:04:15 +02:00
Keviin Åberg Kultalahti 132dd2cbe0 adds frontend for updating roles of a user 2021-05-14 15:03:58 +02:00
Andrew Kingston 47db3df0a1 Add optional info text to components 2021-05-14 13:29:14 +01: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
Andrew Kingston d49ca2d308 Update autoscreens with new dataprovier props 2021-05-13 16:32:18 +01:00
Martin McKeaveney ecde960fd9 Open app call 2021-05-13 15:33:04 +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
Andrew Kingston c669526c66 Remove search component from component structure 2021-05-13 12:38:56 +01:00
mike12345567 71b0fc8f40 Formatting. 2021-05-13 12:32:18 +01:00
Andrew Kingston d9923e1e98 Clean up data source context and remove explicit button actions for pagination 2021-05-13 12:30:45 +01:00
Mike Shanks 3aaeb8f7da v0.8.18 2021-05-13 11:17:08 +01:00
Martin McKeaveney 61a5b109f5 dev mode E2E 2021-05-13 11:06:08 +01:00
Mike Shanks fb3d91372e deprecation warning styling 2021-05-13 09:41:40 +01:00
Mike Shanks 415e83326a desktop deprecation banner 2021-05-12 17:17:08 +01:00
Keviin Åberg Kultalahti b692ca9255 remove log 2021-05-12 17:21:15 +02:00
Keviin Åberg Kultalahti a31b8cbdbf fix broken settings page 2021-05-12 17:16:31 +02:00
Andrew Kingston 4147b7203c Fix two-tone spectrum background colours 2021-05-12 14:52:43 +01:00
Andrew Kingston 16c6e09c61 Merge branch 'next' of github.com:Budibase/budibase into lab-day-search 2021-05-12 14:35:00 +01:00
Andrew Kingston 5131a2fd74 Fix chart placeholder, fix spectrum colours and begin work on pagination component 2021-05-12 14:34:25 +01:00
mike12345567 8f7a3f4d69 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 13:59:59 +01:00
Keviin Åberg Kultalahti 46ac4b43a1 hook up logo upload 2021-05-12 14:43:36 +02:00
Keviin Åberg Kultalahti acf963ceb3 consolidate imports in CreateAppModal 2021-05-12 14:38:03 +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
Keviin Åberg Kultalahti 427592431d add acceptInvite method to users store 2021-05-12 14:07:55 +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 56d117c819 fixes from PR 2021-05-12 12:38:49 +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
Mike Shanks c92d99eaf9 fix - rest api datasource not accepting parameters 2021-05-12 10:17:47 +01:00
Keviin Åberg Kultalahti 1ea4a9d850 correct notification message 2021-05-12 11:15:51 +02:00
Keviin Åberg Kultalahti 0dfa0df335 remove unneeded refetch in user delete method 2021-05-12 11:15:40 +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
Andrew Kingston 6d1c9c3e44 Add legacy in-memory filtering and sorting for views and external datasources 2021-05-11 19:07:52 +01:00
Andrew Kingston a3fbe6a34a Allow data provider filtering using dates and date ranges, and allow filtering using a value or binding for any type 2021-05-11 18:33:25 +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 137fe43c8a change exports 2021-05-11 18:19:32 +02:00
Keviin Åberg Kultalahti 1a9e93f5b6 reword touched logic and export it as a store 2021-05-11 18:08:55 +02:00
Keviin Åberg Kultalahti 5add018eea updates AddUserModal to use new validator 2021-05-11 18:03:43 +02:00
Keviin Åberg Kultalahti cd2b5128f5 add touched check to validator 2021-05-11 18:03:14 +02:00
Keviin Åberg Kultalahti f2e6259bb7 adds missing files 2021-05-11 17:51:19 +02:00
Keviin Åberg Kultalahti e0993951b2 moves helpers to dedicated folder and adds input validation helper stores 2021-05-11 17:51:01 +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
Andrew Kingston 78ae68981e Add support for numerical sorting 2021-05-11 11:24:16 +01:00
Keviin Åberg Kultalahti bf50ed2304 Merge branch 'next' into admin/user-management-ui 2021-05-11 12:01:31 +02:00
Andrew Kingston 3eabaea42f Merge branch 'next' of github.com:Budibase/budibase into lab-day-search 2021-05-11 10:47:52 +01:00
Andrew Kingston 5aebceb608
Merge pull request #1472 from Budibase/app-list
App list screen
2021-05-11 08:43:47 +01:00
mike12345567 a32ae1db46 Fixing an issue that occurred in a merge. 2021-05-10 18:14:18 +01:00
Andrew Kingston 146e10d2ed Remove commented out code 2021-05-10 18:03:14 +01: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 ea8385f42c Merge branch 'next' into admin/user-management-ui 2021-05-10 17:42:46 +02: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
Andrew Kingston 86b0ab7600 Update gradient algorithm to use a seed value for predictable gradients and use app names for seeds 2021-05-10 15:28:52 +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
mike12345567 6fa96981ae Other minor fixes after doing some initial setup testing. 2021-05-10 13:18:05 +01:00
Andrew Kingston b3877a5031 Properly key each app card 2021-05-10 12:36:32 +01:00
Andrew Kingston 49c12cf80a Fix create app modal validation 2021-05-10 12:36:15 +01:00
Andrew Kingston 526107aeb0 Merge branch 'next' of github.com:Budibase/budibase into app-list 2021-05-10 12:31:42 +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
mike12345567 902119c39c Updating with a tested and functional API for uploading files for configs. 2021-05-07 13:55:30 +01:00
Keviin Åberg Kultalahti aef14aa35d adds users, user page and add user modal 2021-05-07 14:53:20 +02:00
Keviin Åberg Kultalahti 2705722e3d updates fetchData helper store 2021-05-07 14:52:58 +02:00
Andrew Kingston d8120d107c Adjust padding in app list table view 2021-05-07 13:44:53 +01:00
Keviin Åberg Kultalahti b0e20eddc3 creates a custom helper store for fetching data 2021-05-07 14:30:51 +02:00
Andrew Kingston 81e9d8833c Handle long app names correctly in app grid view 2021-05-07 13:29:05 +01:00
Andrew Kingston f0b39f2530 Add small horiztonal padding to app list table view to improve text overflow 2021-05-07 13:17:49 +01:00
Andrew Kingston e6e47a6d03 Add table app list view 2021-05-07 13:13:51 +01:00
Andrew Kingston 93b4a3bd78 Update default gradients slightly 2021-05-07 13:13:34 +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
dependabot[bot] 647c443fd4
Bump lodash from 4.17.13 to 4.17.21
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 08:57:55 +00: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 41ea4d1008 Fix URL being pushed after creating an app 2021-05-07 07:56:36 +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 c3ea022f8b Configure vite with a base URL so proxy works 2021-05-06 17:22:09 +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 a8a1f88eb8 Update AppCard padding 2021-05-06 15:34: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
Andrew Kingston 845054a5b1 Add new file for common svelte actions 2021-05-06 13:58:42 +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
Michael Drury f823b73a47
Merge pull request #1449 from Budibase/feature/password-reset
Password reset and invitations backend
2021-05-06 11:04:15 +01:00
Martin McKeaveney 2fe2d521cf lint 2021-05-06 10:57:24 +01:00
Martin McKeaveney 7cad598269 refactor CSS 2021-05-06 10:30:38 +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
Andrew Kingston 67fad5def0 Update border colour definitions to match designs 2021-05-06 10:17:47 +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
mike12345567 2614027969 Formatting. 2021-05-05 18:00:50 +01:00
mike12345567 2f0c3562ac Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-05 18:00:22 +01:00
Martin McKeaveney 0525be382d basic UI for creating first admin user 2021-05-05 17:58:09 +01:00
Keviin Åberg Kultalahti f805cdfb07 lintfix 2021-05-05 18:53:38 +02:00
Keviin Åberg Kultalahti cd9af13668 moves admin store to `stores/portal` 2021-05-05 18:52:45 +02: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