MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,282 Commits 112 Branches 2,974 Tags 956 MiB
Commit Graph

3467 Commits

Author SHA1 Message Date
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
Keviin Åberg Kultalahti 4df56ce457 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:32:08 +02:00
Keviin Åberg Kultalahti 61cabc7fc5 update settings page text 2021-05-14 17:03:47 +02:00
mike12345567 cea82f9335 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 47bc197b45 lint fixes 2021-05-14 16:09:07 +02:00
Keviin Åberg Kultalahti 7a4b6850a8 switches input to search component 2021-05-14 15:49:57 +02:00
Keviin Åberg Kultalahti 98d2182e78 move email page into the manage subsection 2021-05-14 15:41:15 +02:00
Keviin Åberg Kultalahti bdca818c48 adds notifications to roles updating action 2021-05-14 15:14:37 +02:00
Keviin Åberg Kultalahti ac883053e0 adds dummy updateRoles functioon to users store 2021-05-14 15:04:15 +02:00
Keviin Åberg Kultalahti 4fdb1d080d adds frontend for updating roles of a user 2021-05-14 15:03:58 +02:00
Andrew Kingston e78d686292 Add optional info text to components 2021-05-14 13:29:14 +01:00
Martin McKeaveney 48006408f1 publish button 2021-05-13 17:33:31 +01:00
Martin McKeaveney 95c80f2b4a set up live replication between prod and dev instances 2021-05-13 17:24:32 +01:00
Andrew Kingston 9c7f5f98b7 Update autoscreens with new dataprovier props 2021-05-13 16:32:18 +01:00
Martin McKeaveney 51bdbb7878 Open app call 2021-05-13 15:33:04 +01:00
Martin McKeaveney 8d37a9bc8b fix response status from lock release call 2021-05-13 14:29:27 +01:00
Martin McKeaveney 4a4c96f76d merge, UI for managing your own app locks 2021-05-13 14:04:03 +01:00
mike12345567 81c5ed5554 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 c2c74678e4 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 c1b6f26f28 Remove search component from component structure 2021-05-13 12:38:56 +01:00
mike12345567 768fa8e725 Formatting. 2021-05-13 12:32:18 +01:00
Andrew Kingston 4d564365cf Clean up data source context and remove explicit button actions for pagination 2021-05-13 12:30:45 +01:00
Mike Shanks 04a159986e v0.8.18 2021-05-13 11:17:08 +01:00
Martin McKeaveney c3e7548255 dev mode E2E 2021-05-13 11:06:08 +01:00
Mike Shanks 209f0ad2fd deprecation warning styling 2021-05-13 09:41:40 +01:00
Mike Shanks 787d397593 desktop deprecation banner 2021-05-12 17:17:08 +01:00
Keviin Åberg Kultalahti 11c8c74111 remove log 2021-05-12 17:21:15 +02:00
Keviin Åberg Kultalahti 6885c7ad04 fix broken settings page 2021-05-12 17:16:31 +02:00
Andrew Kingston 34a2382b88 Fix two-tone spectrum background colours 2021-05-12 14:52:43 +01:00
Andrew Kingston 3a747de207 Merge branch 'next' of github.com:Budibase/budibase into lab-day-search 2021-05-12 14:35:00 +01:00
Andrew Kingston c2cc99ef2c Fix chart placeholder, fix spectrum colours and begin work on pagination component 2021-05-12 14:34:25 +01:00
mike12345567 abeb78d914 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 13:59:59 +01:00
Keviin Åberg Kultalahti c4b2678f33 hook up logo upload 2021-05-12 14:43:36 +02:00
Keviin Åberg Kultalahti 0c3c17c335 consolidate imports in CreateAppModal 2021-05-12 14:38:03 +02:00
Keviin Åberg Kultalahti 17eca8c30b Merge branch 'next' into admin/user-management-ui 2021-05-12 14:08:58 +02:00
Keviin Åberg Kultalahti 352f8dd625 add wip file upload 2021-05-12 14:08:44 +02:00
Keviin Åberg Kultalahti b610bf446e add acceptInvite method to users store 2021-05-12 14:07:55 +02:00
mike12345567 13b1e78ee2 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 12:49:42 +01:00
Martin McKeaveney 022f501dee fixes from PR 2021-05-12 12:38:49 +01:00
Martin McKeaveney a795d5e96e remove redundant handler 2021-05-12 11:51:03 +01:00
Keviin Åberg Kultalahti 873f535484 invite flow now working 2021-05-12 12:49:14 +02:00
Keviin Åberg Kultalahti 05244c86dc stops redirect from builder/invite if not authed 2021-05-12 11:44:47 +02:00
Keviin Åberg Kultalahti b3c63defb3 sets up invite action in onboarding modal 2021-05-12 11:33:04 +02:00
Mike Shanks 93596311bb fix - rest api datasource not accepting parameters 2021-05-12 10:17:47 +01:00
Keviin Åberg Kultalahti 28223baa41 correct notification message 2021-05-12 11:15:51 +02:00
Keviin Åberg Kultalahti 3d37e3e335 remove unneeded refetch in user delete method 2021-05-12 11:15:40 +02:00
Keviin Åberg Kultalahti 7137cc6f60 enables functionality to delete users from frontend 2021-05-12 11:08:21 +02:00
Keviin Åberg Kultalahti f196f480be adds create user flow 2021-05-12 11:00:18 +02:00
Keviin Åberg Kultalahti 395825dc8b remove log statements 2021-05-12 10:30:58 +02:00
Keviin Åberg Kultalahti 651009db08 correct error and touched states for buttons 2021-05-12 09:55:33 +02:00
Keviin Åberg Kultalahti ac510e2671 move logic from Users page to separate component 2021-05-12 09:13:59 +02:00
Keviin Åberg Kultalahti 34a3a5916a fix userId import 2021-05-12 09:13:38 +02:00
Keviin Åberg Kultalahti 75c71f6891 cleanup top layout file 2021-05-12 09:13:25 +02:00
Martin McKeaveney 562b0cc40a tidy up 2021-05-11 19:54:01 +01:00
Andrew Kingston 889f5f8175 Add legacy in-memory filtering and sorting for views and external datasources 2021-05-11 19:07:52 +01:00
Andrew Kingston 4db2ee1843 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 2ec6b15e56 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 548c56cb00 change exports 2021-05-11 18:19:32 +02:00
Keviin Åberg Kultalahti c450e5cd8a reword touched logic and export it as a store 2021-05-11 18:08:55 +02:00
Keviin Åberg Kultalahti 2b3c4ee2bc updates AddUserModal to use new validator 2021-05-11 18:03:43 +02:00
Keviin Åberg Kultalahti 46cbba1cc0 add touched check to validator 2021-05-11 18:03:14 +02:00
Keviin Åberg Kultalahti b10c41143f adds missing files 2021-05-11 17:51:19 +02:00
Keviin Åberg Kultalahti e8d8bb67ee moves helpers to dedicated folder and adds input validation helper stores 2021-05-11 17:51:01 +02:00
mike12345567 c70d4444a9 Formatting. 2021-05-11 15:24:17 +01:00
Martin McKeaveney b1d60cc6b6 email template E2E, adding preview 2021-05-11 14:44:43 +01:00
Andrew Kingston 1a2e17ff17 Add support for numerical sorting 2021-05-11 11:24:16 +01:00
Keviin Åberg Kultalahti 7e8bee48d8 Merge branch 'next' into admin/user-management-ui 2021-05-11 12:01:31 +02:00
Andrew Kingston e661fe8cf2 Merge branch 'next' of github.com:Budibase/budibase into lab-day-search 2021-05-11 10:47:52 +01:00
Andrew Kingston 63c22494fd Merge pull request #1472 from Budibase/app-list 
App list screen
 2021-05-11 08:43:47 +01:00
mike12345567 c0d1f5ef8c Fixing an issue that occurred in a merge. 2021-05-10 18:14:18 +01:00
Andrew Kingston 132cfce328 Remove commented out code 2021-05-10 18:03:14 +01:00
Andrew Kingston c1c04309d5 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 cf813d1cbb Merge branch 'next' into admin/user-management-ui 2021-05-10 17:42:46 +02:00
Keviin Åberg Kultalahti 6645e0d61d adds notifications to users pages 2021-05-10 17:42:23 +02:00
Andrew Kingston 6a2f711e77 Add empty state to apps screen 2021-05-10 16:15:00 +01:00
Andrew Kingston 2421529ba8 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 4ccb326ece lint 2021-05-10 14:50:37 +01:00
Martin McKeaveney 2be60b8c71 edit template HTML in modal 2021-05-10 14:47:16 +01:00
Martin McKeaveney 8174f44d40 pull template type from body instead of params 2021-05-10 14:41:52 +01:00
mike12345567 77b4b206f7 Other minor fixes after doing some initial setup testing. 2021-05-10 13:18:05 +01:00
Andrew Kingston 99ff417aa8 Properly key each app card 2021-05-10 12:36:32 +01:00
Andrew Kingston 04dc9ca175 Fix create app modal validation 2021-05-10 12:36:15 +01:00
Andrew Kingston 0254e85996 Merge branch 'next' of github.com:Budibase/budibase into app-list 2021-05-10 12:31:42 +01:00
Andrew Kingston 0b1b4d2aae Simplify app layout and add option to delete apps 2021-05-10 12:28:54 +01:00
Martin McKeaveney 11ce48e1ff editor styling 2021-05-10 12:06:31 +01:00
Andrew Kingston df607e78eb Add non-gallery option to dropzeon and update create app modal 2021-05-10 11:53:32 +01:00
Keviin Åberg Kultalahti ea8e6d675d adds warning prop to ModalContent to enable warning buttons 2021-05-07 14:56:27 +02:00
mike12345567 4e3bc326b4 Updating with a tested and functional API for uploading files for configs. 2021-05-07 13:55:30 +01:00
Keviin Åberg Kultalahti 04b332e104 adds users, user page and add user modal 2021-05-07 14:53:20 +02:00
Keviin Åberg Kultalahti 35b731a356 updates fetchData helper store 2021-05-07 14:52:58 +02:00
Andrew Kingston f1b2fea3c0 Adjust padding in app list table view 2021-05-07 13:44:53 +01:00
Keviin Åberg Kultalahti ae2148e481 creates a custom helper store for fetching data 2021-05-07 14:30:51 +02:00
Andrew Kingston b5dade2d50 Handle long app names correctly in app grid view 2021-05-07 13:29:05 +01:00
Andrew Kingston be28fc2fb8 Add small horiztonal padding to app list table view to improve text overflow 2021-05-07 13:17:49 +01:00
Andrew Kingston 35b9ab353e Add table app list view 2021-05-07 13:13:51 +01:00
Andrew Kingston 010fc955d7 Update default gradients slightly 2021-05-07 13:13:34 +01:00
Keviin Åberg Kultalahti cb78e68d99 adds separate Basic Onboarding modal 2021-05-07 13:58:14 +02:00
Keviin Åberg Kultalahti d4d8506fd5 enables front-end search of users 2021-05-07 13:24:07 +02:00
Keviin Åberg Kultalahti e7e249521b merge fixes 2021-05-07 12:16:09 +02:00
Keviin Åberg Kultalahti ca06e5d16e Merge branch 'app-list' into admin/user-management-ui 2021-05-07 12:15:58 +02:00
Andrew Kingston 830069970a Bump svelte and routify deps, fix builder _reset usage and some tidy ups 2021-05-07 11:14:43 +01:00
dependabot[bot] e46964b763 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 ad7e892226 Merge branch 'next' into admin/user-management-ui 2021-05-07 09:47:45 +02:00
Keviin Åberg Kultalahti 0a42bce2c0 adds users store and moves some components 2021-05-07 09:47:05 +02:00
Andrew Kingston be04060ff1 Server builder under /builder rather than /app for top level to avoid confusion 2021-05-07 08:17:21 +01:00
Andrew Kingston f2addd0b9c Make pages scrollable 2021-05-07 07:56:56 +01:00
Andrew Kingston dff4e9501c Fix URL being pushed after creating an app 2021-05-07 07:56:36 +01:00
Andrew Kingston 6958e860ef Improve app list styles 2021-05-06 22:28:50 +01:00
Martin McKeaveney 062d8323f4 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 7588030780 SMTP and template management E2E 2021-05-06 18:02:44 +01:00
Andrew Kingston 5a642071d6 Configure vite with a base URL so proxy works 2021-05-06 17:22:09 +01:00
Andrew Kingston 1712f559aa 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 6405bf6603 Update AppCard padding 2021-05-06 15:34:34 +01:00
Andrew Kingston 986dc74190 Update portal pages to have better usage of spectrum components 2021-05-06 15:34:22 +01:00
Andrew Kingston 4d69e8c5c2 Add log out and old settings to action menu from top bar avatar 2021-05-06 15:00:35 +01:00
Andrew Kingston 2e335019cd Tidy up auth logic in routes 2021-05-06 14:52:20 +01:00
Andrew Kingston 735c724a0d 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 3530d46583 Delete old builder layout page 2021-05-06 14:47:41 +01:00
Andrew Kingston 4a813b4078 Add new auth page to handle login and future work on reset password etc 2021-05-06 14:47:21 +01:00
Andrew Kingston 817511b47c Fix app card text size and bug with global css rule 2021-05-06 14:16:17 +01:00
Andrew Kingston 199efd145b Touch up admin user creation to match designs 2021-05-06 14:11:06 +01:00
Andrew Kingston 1ed08a8a8b Merge branch 'next' of github.com:Budibase/budibase into app-list 2021-05-06 14:01:03 +01:00
Andrew Kingston 6164f38cf9 Move app list to admin portal 2021-05-06 13:59:06 +01:00
Andrew Kingston 613f914589 Add new file for common svelte actions 2021-05-06 13:58:42 +01:00
Keviin Åberg Kultalahti 555cdcd5c4 wip: skeleton for users page 2021-05-06 14:34:41 +02:00
Martin McKeaveney 559b8789f6 merge with next 2021-05-06 11:56:53 +01:00
Keviin Åberg Kultalahti b0dc278880 Merge branch 'next' into admin/user-management-ui 2021-05-06 12:56:46 +02:00
Michael Drury a7b6dbe303 Merge pull request #1449 from Budibase/feature/password-reset 
Password reset and invitations backend
 2021-05-06 11:04:15 +01:00
Martin McKeaveney 42e0b3c1f9 lint ✨ 2021-05-06 10:57:24 +01:00
Martin McKeaveney f82754a544 refactor CSS 2021-05-06 10:30:38 +01:00
Martin McKeaveney 56018828c3 budibase config checklist complete 2021-05-06 10:28:06 +01:00
Andrew Kingston c8ecc38bfb Add skeleton for apps page as example of full width page 2021-05-06 10:22:36 +01:00
Andrew Kingston d004d507f5 Update existing pages to use Page layout component 2021-05-06 10:22:17 +01:00
Andrew Kingston e1b32848ba Add default portal redirect 2021-05-06 10:18:41 +01:00
Andrew Kingston 1a33ad4892 Update core layout to allow full width pages and match designs 2021-05-06 10:18:25 +01:00
Andrew Kingston c7ea69a383 Update border colour definitions to match designs 2021-05-06 10:17:47 +01:00
Keviin Åberg Kultalahti 3f26cf3626 add manage subroute to host users, auth, email pages 2021-05-06 11:00:41 +02:00
Martin McKeaveney 039e72ae98 merge 2021-05-06 09:17:05 +01:00
Martin McKeaveney fd2e2c0415 first time setup E2E 2021-05-05 21:56:43 +01:00
Martin McKeaveney 39b293aa9d endpoint for budibase configuration checklist 2021-05-05 20:58:31 +01:00
mike12345567 6e5d985436 Formatting. 2021-05-05 18:00:50 +01:00
mike12345567 82687bad26 Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-05 18:00:22 +01:00
Martin McKeaveney 4fc93781dc basic UI for creating first admin user 2021-05-05 17:58:09 +01:00
Keviin Åberg Kultalahti baca6a6621 lintfix 2021-05-05 18:53:38 +02:00
Keviin Åberg Kultalahti 3b570fff83 moves admin store to `stores/portal` 2021-05-05 18:52:45 +02:00
Keviin Åberg Kultalahti 725a9ec2cc remove unneeded class 2021-05-05 18:45:18 +02:00
Keviin Åberg Kultalahti 3595278190 remove some unneeded after fixing _layout 2021-05-05 18:44:55 +02:00
Keviin Åberg Kultalahti d960dfbbbd fix merge conflict 2021-05-05 18:42:50 +02:00
Keviin Åberg Kultalahti 13468a5a3f format fixes 2021-05-05 18:41:42 +02:00
Keviin Åberg Kultalahti 677106a58b lint fix 2021-05-05 18:41:16 +02:00
Keviin Åberg Kultalahti 98b1bbc655 merge next 2021-05-05 18:40:55 +02:00
Keviin Åberg Kultalahti ae43bbe008 add analytics toggling 2021-05-05 18:39:36 +02:00
Keviin Åberg Kultalahti ef129b7595 update org store and add loading state + notifications to save action 2021-05-05 18:30:03 +02:00
Martin McKeaveney fc98a73f4c fix styling 2021-05-05 17:21:35 +01:00
Keviin Åberg Kultalahti 1f451d07de introduces portal stores concept and adds an org one that handles configs 2021-05-05 17:50:45 +02:00
Martin McKeaveney 037299d324 Merge branch 'next' of https://github.com/Budibase/budibase into oauth-config-screen 2021-05-05 14:54:12 +01:00
Keviin Åberg Kultalahti ed2fd4ca95 move settings to a subpath 2021-05-05 12:56:12 +02:00
Martin McKeaveney 1b2fa1bbd6 tidy up imports 2021-05-05 11:03:45 +01:00
Keviin Åberg Kultalahti 5af66591da adds active indicator to sidenav 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti b837474bd8 passes in dummy user.name data to Avatar component 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti 40a3b7324b remove dummy text from index page 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti e46ea324b5 update layout 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti a826fbf60e more structure to layout 2021-05-05 11:22:54 +02:00
Keviin Åberg Kultalahti 80564e2b7d remove unused styling 2021-05-05 11:22:54 +02:00
Keviin Åberg Kultalahti df30e594df allow navigation to other URLs than /builder 2021-05-05 11:22:39 +02:00
Martin McKeaveney 77830bec4f lint and tidy 2021-05-04 18:14:13 +01:00
Martin McKeaveney cb02c9bf58 google oauth UI 2021-05-04 17:31:06 +01:00
mike12345567 b01da0aad5 Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-04 15:21:53 +01:00
mike12345567 e5f3b3956c Merge branch 'next' of github.com:Budibase/budibase into labday/mike-formulas 2021-05-04 13:24:14 +01:00
Martin McKeaveney 4086d39535 merge with next 2021-05-04 11:49:34 +01:00