Commit Graph

5697 Commits

Author SHA1 Message Date
mike12345567 c37f41fbd5 Making the code a query string parameter for invite/reset urls. 2021-05-05 18:13:59 +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
mike12345567 44db8cf9ec Formatting. 2021-05-05 17:49:53 +01:00
mike12345567 96f036b720 Updating testing system across the board after playing around with it, having the worker tests run when top level test is ran, fixing environment in worker when testing, removing the use of redis (replacing with ioredis-mock) when in test. 2021-05-05 17:49:34 +01:00
Martin McKeaveney 657eddb9e7
Merge pull request #1446 from Budibase/oauth-config-screen
Oauth config screen
2021-05-05 17:28:04 +01:00
Martin McKeaveney c381f08b4a fix styling 2021-05-05 17:21:35 +01:00
mike12345567 1a2556b6fd Formatting. 2021-05-05 16:00:15 +01:00
mike12345567 4d49fd4da0 Updating configs API based on some feedback during the development of the settings frontend. 2021-05-05 15:59:24 +01:00
mike12345567 3812a31a22 Formatting. 2021-05-05 15:19:44 +01:00
mike12345567 7b92046052 Finishing invite send email. 2021-05-05 15:17:15 +01:00
mike12345567 f1650105f4 Finalising the usage of redis in the password reset and invitation systems. 2021-05-05 15:10:28 +01: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
mike12345567 f781e8b350 Formatting. 2021-05-05 12:11:31 +01:00
mike12345567 e31eb5d3d2 Fleshed out fully all redis interactions for invitations and password resets. 2021-05-05 12:11:06 +01:00
Martin McKeaveney 4e494b23c9 tidy up imports 2021-05-05 11:03:45 +01:00
Kevin Åberg Kultalahti c398e94170
Merge pull request #1447 from Budibase/admin/top-layout
Adds the Admin Layout
2021-05-05 11:45:01 +02:00
Keviin Åberg Kultalahti 1fdeb1a33e Merge branch 'admin/top-layout' of github.com:Budibase/budibase into admin/top-layout 2021-05-05 11:25:10 +02:00
Keviin Åberg Kultalahti 655d1de921 adds active indicator to sidenav 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti 2520948a93 passes in dummy user.name data to Avatar component 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti fc351c0ea6 remove dummy text from index page 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti 1ccd023b04 passing in a name now shows initials in Avatar component 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti 256554d6fc adjust font-size with size on Avatar component 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti d33b9b8e97 add sizing prop to Avatar 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti d466db1e24 update layout 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti 72dd292e17 working ProgressCircle 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti 91518bdef8 fix progress not showing correctly 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti 91e79ff3a5 wip: update ProgressCircle to take values 2021-05-05 11:23:36 +02:00
Keviin Åberg Kultalahti 478f76ee42 adds wip initial mode to Avatar 2021-05-05 11:22:54 +02:00
Keviin Åberg Kultalahti 16f8ab96ca more structure to layout 2021-05-05 11:22:54 +02:00
Keviin Åberg Kultalahti 88606feeb1 remove unused styling 2021-05-05 11:22:54 +02:00
Keviin Åberg Kultalahti 9980ee8093 allow navigation to other URLs than /builder 2021-05-05 11:22:39 +02:00
Keviin Åberg Kultalahti 8c483880b6 adds active indicator to sidenav 2021-05-05 11:14:08 +02:00
Keviin Åberg Kultalahti 50c698abf8 passes in dummy user.name data to Avatar component 2021-05-05 11:00:33 +02:00
Keviin Åberg Kultalahti 55b8c3e6fb remove dummy text from index page 2021-05-05 11:00:20 +02:00
Keviin Åberg Kultalahti 4d3808a97a passing in a name now shows initials in Avatar component 2021-05-05 11:00:04 +02:00
Keviin Åberg Kultalahti 1efea8c869 adjust font-size with size on Avatar component 2021-05-05 10:44:50 +02:00
Keviin Åberg Kultalahti f283e2b0f5 add sizing prop to Avatar 2021-05-05 10:43:06 +02:00
Keviin Åberg Kultalahti f708238624 update layout 2021-05-05 10:21:55 +02:00
Keviin Åberg Kultalahti 87ed1c0a9e working ProgressCircle 2021-05-05 10:02:48 +02:00
Keviin Åberg Kultalahti 3837478527 fix progress not showing correctly 2021-05-05 09:43:01 +02:00
Keviin Åberg Kultalahti eb896d0cba wip: update ProgressCircle to take values 2021-05-05 09:30:52 +02:00
Keviin Åberg Kultalahti 7e4e7720d7 adds wip initial mode to Avatar 2021-05-05 09:12:25 +02:00
Keviin Åberg Kultalahti 550861ec32 more structure to layout 2021-05-05 09:12:16 +02:00
Keviin Åberg Kultalahti 42125aad7f remove unused styling 2021-05-05 08:48:05 +02:00
Martin McKeaveney d8c3ab7d79 lint and tidy 2021-05-04 18:14:13 +01:00
mike12345567 66341473ca Fixing issues with Redis/Bull and the integration with new redis module. 2021-05-04 18:13:44 +01:00
Martin McKeaveney 88a5660bc3 google oauth UI 2021-05-04 17:31:06 +01:00
mike12345567 89310c0879 Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-04 15:21:53 +01:00
Keviin Åberg Kultalahti 39ef15b719 allow navigation to other URLs than /builder 2021-05-04 16:05:53 +02:00