Commit Graph

3436 Commits

Author SHA1 Message Date
mike12345567 348c61a8c5 Merge branch 'master' of github.com:Budibase/budibase into fix/lockdown-admin 2021-05-21 16:54:52 +01:00
mike12345567 c6a6d49cd7 Updating administration middleware so that internal requests allowed through automatically. 2021-05-21 16:43:01 +01:00
mike12345567 27fc3a3c5e Adding ability to create new admins. 2021-05-21 16:30:37 +01:00
Michael Drury 7fb9673217 Merge pull request #1537 from Budibase/feature/app-updated-at
Mike fixes + application updated at timestamps
2021-05-21 16:10:29 +01:00
Martin McKeaveney 29faf18147 remove superfluous copy 2021-05-21 16:02:49 +01:00
Martin McKeaveney d161f979b6 Merge pull request #1533 from Budibase/martin-fixes
WIP: fixes
2021-05-21 15:49:52 +01:00
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 ede7e38442 Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at 2021-05-21 14:57:41 +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
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
Keviin Åberg Kultalahti 4314a30999 Merge branch 'master' into fixes/user-management 2021-05-21 14:10:36 +02: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
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 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
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
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