MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,412 Commits 114 Branches 2,970 Tags 944 MiB
Commit Graph

5677 Commits

Author SHA1 Message Date
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 31d0a8b483 Upping debounce to 30 seconds as it has no real negative. 2021-05-21 15:14:35 +01:00
mike12345567 aa51bf7f07 Switching logic for lazy evaluation. 2021-05-21 15:03:28 +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
mike12345567 a6e196a351 Making sure roles object is always present, issue #1529. 2021-05-21 14:56:06 +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
mike12345567 06353409bc Making sure the email sends out the write port if no platform URL is set. 2021-05-21 14:38:46 +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
Andrew Kingston 68ed6b6359 Update avatar to take initials prop and render text as uppercase 2021-05-21 13:16:54 +01:00
mike12345567 a1ed0a113b Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at 2021-05-21 13:16:49 +01:00
Keviin Åberg Kultalahti 4314a30999 Merge branch 'master' into fixes/user-management 2021-05-21 14:10:36 +02:00
mike12345567 0ff7bc672a Adding redis to exclusion from coverage (can't currently test). 2021-05-21 13:08:59 +01:00
mike12345567 6ccec1632a Adding a debounced updated at timestamp to applications. 2021-05-21 13:07:10 +01:00
Andrew Kingston 05281c83cb 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 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
Martin McKeaveney 6233de1fc1 Merge pull request #1508 from Budibase/postgres-connection-pool 
postgres connection pooling
 2021-05-21 12:28:51 +01: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 8735ef088f change forceReset bool name 2021-05-21 12:10:02 +02: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
mike12345567 7886600d75 Linting. 2021-05-21 11:06:57 +01: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
Andrew Kingston d30a9ef494 Add StatusLight and Badge components to BBUI 2021-05-21 10:31:45 +01:00
Martin McKeaveney 7ef5a01f04 v0.9.1 2021-05-21 10:04:45 +01:00
Martin McKeaveney e83f600b9e removing skip_setup as it was preventing init 2021-05-20 21:42:27 +01:00
mike12345567 0b924908fd Formatting. 2021-05-20 20:48:46 +01:00
mike12345567 4d6e4475d3 Fixing some issues found when testing. 2021-05-20 20:48:24 +01:00
mike12345567 5e412fa497 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 835e097d6e Fixing test cases. 2021-05-20 16:18:09 +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
Andrew Kingston 74a8eb4c1a Redirect to login from client apps when required 2021-05-20 14:47:17 +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
Martin McKeaveney 3a422be071 simplify docker build before push 2021-05-20 13:54:18 +01: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
Martin McKeaveney e28a5e98ab fix lint 2021-05-20 13:09:02 +01:00
mike12345567 d301ea48a9 Removing all login/logout functionality from apps. 2021-05-20 13:05:58 +01:00
Martin McKeaveney 237642e4af merge 2021-05-20 12:41:54 +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
mike12345567 148cf87224 Cleanup after testing/looking through hosting files. 2021-05-20 12:21:58 +01:00
mike12345567 3437f620d6 Fixing automation test case. 2021-05-20 12:07:07 +01:00
mike12345567 80704111d4 Merge branch 'master' of github.com:Budibase/budibase into fix/onboarding 2021-05-20 11:56:19 +01:00
Martin McKeaveney 7ab24fed2b merge with master 2021-05-20 10:40:15 +01:00
Martin McKeaveney e6aa34afb5 fix analytics code 2021-05-20 10:26:23 +01:00
Keviin Åberg Kultalahti 4a3f6418ee yarn lock 2021-05-20 11:02:29 +02: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 6817ceb3f6 hard coding posthog api key 2021-05-19 21:41:56 +01:00
Martin McKeaveney 6cb1380770 postgres connection pooling 2021-05-19 20:58:59 +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
Andrew Kingston b98781ef1d Remove unused prop 2021-05-19 18:45:14 +01:00
mike12345567 12bbe19ed0 Fixing worker test cases. 2021-05-19 16:39:17 +01:00
mike12345567 7d3169e5e1 Formatting. 2021-05-19 16:24:50 +01:00
mike12345567 4e9097862d Updating user test cases. 2021-05-19 16:24:20 +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 4824d7810a Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:38:21 +01:00
mike12345567 91ed6679c4 Adding a get self endpoint in the global users. 2021-05-19 13:37:59 +01:00
Andrew Kingston 9b0812921b Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:31:27 +01:00
mike12345567 5e7ca07af7 Allowing null for global user endpoint properties. 2021-05-19 13:30:55 +01:00
Andrew Kingston 86a128060b Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:23:51 +01:00
mike12345567 c2cd365e76 Removing admin middleware applying to everything. 2021-05-19 13:22:05 +01:00
Andrew Kingston fb40cc877f Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:20:41 +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
mike12345567 db3497c83a Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:18:38 +01:00
mike12345567 f08b894e55 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 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
Keviin Åberg Kultalahti dc0fb8fbfe add forcePasswordReset bool to user object validation 2021-05-19 13:24:14 +02:00
mike12345567 31f16090ee Fixing test cases. 2021-05-19 11:27:19 +01: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
Martin McKeaveney 72e18cd8d3 remove outputs from cron 2021-05-19 10:57:02 +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 8049088fa0 Update Layout to be position relative 2021-05-19 10:36:39 +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
Andrew Kingston 76cef0b06d Remove margin in BBUI body component 2021-05-19 09:02:51 +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 6a92e7304b Allow dropzone to preview images before being uploaded 2021-05-18 18:47:39 +01:00
mmckeaveney 025616d7cc groundwork for cron automation trigger 2021-05-18 15:37:54 +00:00
mike12345567 1896b1fe52 Updating text align style to be optional. 2021-05-18 16:03:06 +01:00
mike12345567 14cd1744ff Updating reset link to match that of the builder. 2021-05-18 15:48:28 +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
Andrew Kingston 0f73190b5f Add font weight property to BBUI layout body 2021-05-18 13:52:42 +01:00
Andrew Kingston c575850dc0 Ensure layout page component always fills the page 2021-05-18 13:52:26 +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 7c3e7ab7aa updates invite url 2021-05-18 12:18:06 +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
Andrew Kingston 222afc6884 Add ability for BBUI text fields to update on change and default to true 2021-05-18 08:37:07 +01:00
Andrew Kingston b195ef1549 Fix issue with switches and checkboxes on firefox on linux 2021-05-18 08:20:46 +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
Andrew Kingston ce67c21efe Add option for text alignment to Body 2021-05-17 17:49:40 +01:00
Andrew Kingston 724593f341 Add option to layout to justify items 2021-05-17 17:42:12 +01:00
mike12345567 43899cae68 Adding login form from designs. 2021-05-17 16:48:26 +01:00
Martin McKeaveney ad64d58af4 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 c32b52430e flip bool 2021-05-17 16:33:33 +01:00
Keviin Åberg Kultalahti 9eaabda8a5 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 16:41:46 +02:00
Keviin Åberg Kultalahti 3844e119a8 remove accidental extra component 2021-05-17 16:38:41 +02:00
mike12345567 78ba2353ee Merge branch 'feature/draft-apps' of github.com:Budibase/budibase into feature/forgot-password 2021-05-17 15:32:03 +01:00
mike12345567 cf056ade04 Updating templating bindings enumerations. 2021-05-17 15:30:24 +01: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 7082a1aaa2 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:53:32 +02:00
mike12345567 30f6238d45 don't use the _id prop of the app metadata. 2021-05-17 14:52:49 +01:00
Keviin Åberg Kultalahti 7fa617a543 erge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:29:33 +02:00
mike12345567 c6e9dd7a68 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 116ae6eeea Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:28:52 +02:00
mike12345567 e51afc7451 Updating roles API further so find API works too. 2021-05-17 14:28:41 +01:00
Martin McKeaveney f1cd6d01e9 tidy up 2021-05-17 14:24:37 +01:00