Commit Graph

5695 Commits

Author SHA1 Message Date
mike12345567 82687bad26 Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-05 18:00:22 +01:00
mike12345567 83c16a9f14 Formatting. 2021-05-05 17:49:53 +01:00
mike12345567 2ee4fd21e4 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 df4bbd8205 Merge pull request #1446 from Budibase/oauth-config-screen
Oauth config screen
2021-05-05 17:28:04 +01:00
Martin McKeaveney fc98a73f4c fix styling 2021-05-05 17:21:35 +01:00
mike12345567 48236b2c2f Formatting. 2021-05-05 16:00:15 +01:00
mike12345567 5d2c1c23aa Updating configs API based on some feedback during the development of the settings frontend. 2021-05-05 15:59:24 +01:00
mike12345567 403ee4a870 Formatting. 2021-05-05 15:19:44 +01:00
mike12345567 b4beb4d8da Finishing invite send email. 2021-05-05 15:17:15 +01:00
mike12345567 7bc3514fc1 Finalising the usage of redis in the password reset and invitation systems. 2021-05-05 15:10:28 +01: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
mike12345567 fc01bdaac9 Formatting. 2021-05-05 12:11:31 +01:00
mike12345567 b372d2a824 Fleshed out fully all redis interactions for invitations and password resets. 2021-05-05 12:11:06 +01:00
Martin McKeaveney 1b2fa1bbd6 tidy up imports 2021-05-05 11:03:45 +01:00
Kevin Åberg Kultalahti 6932deb7c7 Merge pull request #1447 from Budibase/admin/top-layout
Adds the Admin Layout
2021-05-05 11:45:01 +02:00
Keviin Åberg Kultalahti a0be040048 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 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 22259b5077 passing in a name now shows initials in Avatar component 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti a8fdd8541e adjust font-size with size on Avatar component 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti 0a8babd24d add sizing prop to Avatar 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 341b71cfd9 working ProgressCircle 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti b9ec7568d8 fix progress not showing correctly 2021-05-05 11:23:42 +02:00
Keviin Åberg Kultalahti 1b2a0e879b wip: update ProgressCircle to take values 2021-05-05 11:23:36 +02:00
Keviin Åberg Kultalahti 6ca0a46d45 adds wip initial mode to Avatar 2021-05-05 11:22:54 +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
Keviin Åberg Kultalahti 31741975d4 adds active indicator to sidenav 2021-05-05 11:14:08 +02:00
Keviin Åberg Kultalahti d39f0547b0 passes in dummy user.name data to Avatar component 2021-05-05 11:00:33 +02:00
Keviin Åberg Kultalahti 63ba8838d6 remove dummy text from index page 2021-05-05 11:00:20 +02:00
Keviin Åberg Kultalahti 8861adc3f1 passing in a name now shows initials in Avatar component 2021-05-05 11:00:04 +02:00
Keviin Åberg Kultalahti 40f2bed090 adjust font-size with size on Avatar component 2021-05-05 10:44:50 +02:00
Keviin Åberg Kultalahti 01db60162c add sizing prop to Avatar 2021-05-05 10:43:06 +02:00
Keviin Åberg Kultalahti 6cee25d16f update layout 2021-05-05 10:21:55 +02:00
Keviin Åberg Kultalahti 5c13d775b8 working ProgressCircle 2021-05-05 10:02:48 +02:00
Keviin Åberg Kultalahti 93c0fb2047 fix progress not showing correctly 2021-05-05 09:43:01 +02:00
Keviin Åberg Kultalahti ff7d222273 wip: update ProgressCircle to take values 2021-05-05 09:30:52 +02:00
Keviin Åberg Kultalahti 69583d1151 adds wip initial mode to Avatar 2021-05-05 09:12:25 +02:00
Keviin Åberg Kultalahti d1e6875e25 more structure to layout 2021-05-05 09:12:16 +02:00
Keviin Åberg Kultalahti bb1eaf8ee0 remove unused styling 2021-05-05 08:48:05 +02:00
Martin McKeaveney 77830bec4f lint and tidy 2021-05-04 18:14:13 +01:00
mike12345567 1cf778845a Fixing issues with Redis/Bull and the integration with new redis module. 2021-05-04 18:13:44 +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
Keviin Åberg Kultalahti 0e6a888e8f allow navigation to other URLs than /builder 2021-05-04 16:05:53 +02:00
Michael Drury a8f9913f79 Merge pull request #1430 from Budibase/labday/mike-formulas
Handlebars formulas
2021-05-04 14:28:11 +01:00
mike12345567 e5f3b3956c Merge branch 'next' of github.com:Budibase/budibase into labday/mike-formulas 2021-05-04 13:24:14 +01:00