Commit Graph

5373 Commits

Author SHA1 Message Date
Martin McKeaveney 0937e39940 remove redundant handler 2021-05-12 11:51:03 +01:00
Keviin Åberg Kultalahti c843e17b31 invite flow now working 2021-05-12 12:49:14 +02:00
Keviin Åberg Kultalahti 982844092d stops redirect from builder/invite if not authed 2021-05-12 11:44:47 +02:00
Keviin Åberg Kultalahti ea342c3e5e sets up invite action in onboarding modal 2021-05-12 11:33:04 +02:00
Keviin Åberg Kultalahti 1ea4a9d850 correct notification message 2021-05-12 11:15:51 +02:00
Keviin Åberg Kultalahti 0dfa0df335 remove unneeded refetch in user delete method 2021-05-12 11:15:40 +02:00
Keviin Åberg Kultalahti 1a8fa817d5 enables functionality to delete users from frontend 2021-05-12 11:08:21 +02:00
Keviin Åberg Kultalahti a3b44caa37 adds create user flow 2021-05-12 11:00:18 +02:00
Keviin Åberg Kultalahti 431a3e5929 remove log statements 2021-05-12 10:30:58 +02:00
Keviin Åberg Kultalahti 10ba5610e6 correct error and touched states for buttons 2021-05-12 09:55:33 +02:00
Keviin Åberg Kultalahti cb0c6bac07 move logic from Users page to separate component 2021-05-12 09:13:59 +02:00
Keviin Åberg Kultalahti 6fc910afc3 fix userId import 2021-05-12 09:13:38 +02:00
Keviin Åberg Kultalahti f075b6ee07 cleanup top layout file 2021-05-12 09:13:25 +02:00
Martin McKeaveney bf0687d2a8 tidy up 2021-05-11 19:54:01 +01:00
Andrew Kingston 6d1c9c3e44 Add legacy in-memory filtering and sorting for views and external datasources 2021-05-11 19:07:52 +01:00
Andrew Kingston a3fbe6a34a 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 e917dbd897 Removing more useless deployment code. 2021-05-11 17:53:54 +01:00
mike12345567 d7d29cf0f3 Formatting. 2021-05-11 17:50:26 +01:00
mike12345567 c9d903a92f 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 137fe43c8a change exports 2021-05-11 18:19:32 +02:00
Keviin Åberg Kultalahti 1a9e93f5b6 reword touched logic and export it as a store 2021-05-11 18:08:55 +02:00
Keviin Åberg Kultalahti 5add018eea updates AddUserModal to use new validator 2021-05-11 18:03:43 +02:00
Keviin Åberg Kultalahti cd2b5128f5 add touched check to validator 2021-05-11 18:03:14 +02:00
Keviin Åberg Kultalahti f2e6259bb7 adds missing files 2021-05-11 17:51:19 +02:00
Keviin Åberg Kultalahti e0993951b2 moves helpers to dedicated folder and adds input validation helper stores 2021-05-11 17:51:01 +02:00
Andrew Kingston 9d08a8f6a6 Merge branch 'lab-day-search' of github.com:Budibase/budibase into lab-day-search 2021-05-11 16:08:41 +01:00
mike12345567 3a1be567b8 Fixing an issue with date objects not being managed by handlebars correctly. 2021-05-11 16:07:55 +01:00
mike12345567 5230dcd3ac Formatting. 2021-05-11 15:24:17 +01:00
mike12345567 2ea05c44b4 Changing INTERNAL_KEY to INTERNAL_API_KEY. 2021-05-11 15:23:03 +01:00
mike12345567 147d67cd26 Merge branch 'smtp-configuration' of github.com:Budibase/budibase into smtp-configuration 2021-05-11 15:09:22 +01:00
mike12345567 8faa9554ed Updating to support SMTP email automation action, as well as some general work around from and subject which previously we'ren't fully implemented. 2021-05-11 15:08:59 +01:00
Martin McKeaveney c8b1adb135 merge 2021-05-11 14:58:55 +01:00
Martin McKeaveney 3bf3fc5e02 email template E2E, adding preview 2021-05-11 14:44:43 +01:00
mike12345567 638e2f5c8e Merge branch 'admin/user-management-ui' of github.com:Budibase/budibase into admin/user-management-ui 2021-05-11 12:51:25 +01:00
mike12345567 ec751b59a4 Fixing an issue with platformUrl being required in settings. 2021-05-11 12:51:14 +01:00
mike12345567 339554b163 Adding link to the real email test. 2021-05-11 12:04:07 +01:00
mike12345567 7d78d7b15a Some updates, working towards supporting automation send smtp email also removing the styling template, adding to base. 2021-05-11 12:02:29 +01:00
Andrew Kingston 78ae68981e Add support for numerical sorting 2021-05-11 11:24:16 +01:00
Keviin Åberg Kultalahti bf50ed2304 Merge branch 'next' into admin/user-management-ui 2021-05-11 12:01:31 +02:00
Andrew Kingston 3eabaea42f Merge branch 'next' of github.com:Budibase/budibase into lab-day-search 2021-05-11 10:47:52 +01:00
Andrew Kingston 5aebceb608
Merge pull request #1472 from Budibase/app-list
App list screen
2021-05-11 08:43:47 +01:00
mike12345567 a32ae1db46 Fixing an issue that occurred in a merge. 2021-05-10 18:14:18 +01:00
mike12345567 330f92ff7c Some cleanup. 2021-05-10 18:07:57 +01:00
Andrew Kingston 146e10d2ed Remove commented out code 2021-05-10 18:03:14 +01:00
Andrew Kingston b240cd9670 Allow tables to render header even when no data exists 2021-05-10 18:01:47 +01:00
Andrew Kingston 14c0bfbdcb 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
mike12345567 479b5870dd Fixing issue with cell renderer not falling back to string rendering when type unknown. 2021-05-10 17:32:10 +01:00
Andrew Kingston 9e1e186020 Adjust modal background to proper background color and add border in lightest them to inline modals 2021-05-10 16:52:09 +01:00
Keviin Åberg Kultalahti ea8385f42c Merge branch 'next' into admin/user-management-ui 2021-05-10 17:42:46 +02:00
Keviin Åberg Kultalahti deb8d77929 adds notifications to users pages 2021-05-10 17:42:23 +02:00
Andrew Kingston 0c53e3bc39 Add empty state to apps screen 2021-05-10 16:15:00 +01:00
Andrew Kingston d829462cd9 Add inline prop for modals to allow them to be used as actual components on pages 2021-05-10 16:14:39 +01:00
Andrew Kingston 07f4144457 Convert Page component to use flex to allow more flexibility 2021-05-10 16:14:12 +01:00
Andrew Kingston 86b0ab7600 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
mike12345567 85030491b2 Renaming registration to invite URL. 2021-05-10 15:05:06 +01:00
Martin McKeaveney 5ae9b46226 lint 2021-05-10 14:50:37 +01:00
Martin McKeaveney 27498a4926 edit template HTML in modal 2021-05-10 14:47:16 +01:00
Martin McKeaveney b415fb2089 pull template type from body instead of params 2021-05-10 14:41:52 +01:00
mike12345567 6fa96981ae Other minor fixes after doing some initial setup testing. 2021-05-10 13:18:05 +01:00
Andrew Kingston b3877a5031 Properly key each app card 2021-05-10 12:36:32 +01:00
Andrew Kingston 49c12cf80a Fix create app modal validation 2021-05-10 12:36:15 +01:00
Andrew Kingston 526107aeb0 Merge branch 'next' of github.com:Budibase/budibase into app-list 2021-05-10 12:31:42 +01:00
Andrew Kingston 3e287a0331 Simplify app layout and add option to delete apps 2021-05-10 12:28:54 +01:00
Martin McKeaveney a207137c92 editor styling 2021-05-10 12:06:31 +01:00
Andrew Kingston 2bf2045a0a Add non-gallery option to dropzeon and update create app modal 2021-05-10 11:53:32 +01:00
mike12345567 2081dd96e0 Making sure relative logo URL is converted to a full path in templates. 2021-05-07 14:30:37 +01:00
mike12345567 595698b7c9 Fixing issue with object store functions not being mockable in the server. 2021-05-07 14:27:46 +01:00
Keviin Åberg Kultalahti 8aeb1654ff adds warning prop to ModalContent to enable warning buttons 2021-05-07 14:56:27 +02:00
mike12345567 634cba509d Formatting. 2021-05-07 13:55:57 +01:00
mike12345567 902119c39c Updating with a tested and functional API for uploading files for configs. 2021-05-07 13:55:30 +01:00
Keviin Åberg Kultalahti aef14aa35d adds users, user page and add user modal 2021-05-07 14:53:20 +02:00
Keviin Åberg Kultalahti 2705722e3d updates fetchData helper store 2021-05-07 14:52:58 +02:00
Keviin Åberg Kultalahti 8607127a0b adds a click dispatch to the Table component 2021-05-07 14:52:46 +02:00
Andrew Kingston d8120d107c Adjust padding in app list table view 2021-05-07 13:44:53 +01:00
Keviin Åberg Kultalahti b0e20eddc3 creates a custom helper store for fetching data 2021-05-07 14:30:51 +02:00
Andrew Kingston 81e9d8833c Handle long app names correctly in app grid view 2021-05-07 13:29:05 +01:00
Andrew Kingston f0b39f2530 Add small horiztonal padding to app list table view to improve text overflow 2021-05-07 13:17:49 +01:00
Andrew Kingston e6e47a6d03 Add table app list view 2021-05-07 13:13:51 +01:00
Andrew Kingston 93b4a3bd78 Update default gradients slightly 2021-05-07 13:13:34 +01:00
Andrew Kingston 78f9f801ce Use local transitions in modal to avoid issues with component unmounting when navigating away 2021-05-07 13:13:24 +01:00
Keviin Åberg Kultalahti 964ce5cab9 adds separate Basic Onboarding modal 2021-05-07 13:58:14 +02:00
mike12345567 ad02e56887 Fixing issues with bullboard and integrating the express app with our koa app (if prefix matches). 2021-05-07 12:24:51 +01:00
Keviin Åberg Kultalahti 3ba439452d enables front-end search of users 2021-05-07 13:24:07 +02:00
mike12345567 7e10dc16b3 Merge branch 'next' of github.com:Budibase/budibase into feature/logo-api 2021-05-07 11:41:32 +01:00
Keviin Åberg Kultalahti 45c49872e6 merge fixes 2021-05-07 12:16:09 +02:00
Keviin Åberg Kultalahti c2bae6da4f Merge branch 'app-list' into admin/user-management-ui 2021-05-07 12:15:58 +02:00
Andrew Kingston 1158276bc6 Bump svelte and routify deps, fix builder _reset usage and some tidy ups 2021-05-07 11:14:43 +01:00
Michael Drury 354f476705
Merge pull request #1460 from Budibase/dependabot/npm_and_yarn/lodash-4.17.21
Bump lodash from 4.17.13 to 4.17.21
2021-05-07 10:16:48 +01:00
Michael Drury 3738781e05
Merge pull request #1459 from Budibase/dependabot/npm_and_yarn/packages/client/lodash-4.17.21
Bump lodash from 4.17.20 to 4.17.21 in /packages/client
2021-05-07 10:16:36 +01:00
dependabot[bot] 647c443fd4
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
dependabot[bot] e4dbd9bfcf
Bump lodash from 4.17.20 to 4.17.21 in /packages/client
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 08:57:35 +00:00
dependabot[bot] 6f2f2add00
Bump handlebars from 4.7.6 to 4.7.7 in /packages/string-templates
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.7.6 to 4.7.7.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.7.6...v4.7.7)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 08:56:46 +00:00
Keviin Åberg Kultalahti f440b32b83 Merge branch 'next' into admin/user-management-ui 2021-05-07 09:47:45 +02:00
Keviin Åberg Kultalahti 43973887b2 adds users store and moves some components 2021-05-07 09:47:05 +02:00
Andrew Kingston 9a69a7ed37 Center menu item icons 2021-05-07 08:36:05 +01:00
Andrew Kingston 9f39690eb1 Server builder under /builder rather than /app for top level to avoid confusion 2021-05-07 08:17:21 +01:00
Andrew Kingston f173d16695 Make pages scrollable 2021-05-07 07:56:56 +01:00
Andrew Kingston 41ea4d1008 Fix URL being pushed after creating an app 2021-05-07 07:56:36 +01:00
Andrew Kingston 6a90f8cecb Improve app list styles 2021-05-06 22:28:50 +01:00
Michael Drury cf762f8dcd Some general backend cleanup. moving packages around, removing some traces of electron, and prepping for standardised object store library. 2021-05-06 19:27:24 +01:00
Martin McKeaveney 1b1d45756b 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 cb2b1037ba SMTP and template management E2E 2021-05-06 18:02:44 +01:00
Andrew Kingston c3ea022f8b Configure vite with a base URL so proxy works 2021-05-06 17:22:09 +01:00
Andrew Kingston f30b52e283 Fix links not working in some components 2021-05-06 17:21:29 +01:00
Andrew Kingston 4160dc1e8d 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 a8a1f88eb8 Update AppCard padding 2021-05-06 15:34:34 +01:00
Andrew Kingston daf58ff554 Update portal pages to have better usage of spectrum components 2021-05-06 15:34:22 +01:00
Andrew Kingston dc6b66afde Reduce size of MenuItem icons 2021-05-06 15:33:28 +01:00
Andrew Kingston f84cf90192 Update label component to use spectrum 2021-05-06 15:33:16 +01:00
Andrew Kingston db9f3d15d1 Add log out and old settings to action menu from top bar avatar 2021-05-06 15:00:35 +01:00
Andrew Kingston e29df9f45c Tidy up auth logic in routes 2021-05-06 14:52:20 +01:00
Andrew Kingston ba65dfd718 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 8cde453e61 Delete old builder layout page 2021-05-06 14:47:41 +01:00
Andrew Kingston 627d41de85 Add new auth page to handle login and future work on reset password etc 2021-05-06 14:47:21 +01:00
Andrew Kingston 37ba425bf1 Fix app card text size and bug with global css rule 2021-05-06 14:16:17 +01:00
Andrew Kingston 700df23e78 Touch up admin user creation to match designs 2021-05-06 14:11:06 +01:00
Andrew Kingston d1a355341f Fix classname in Body component 2021-05-06 14:10:54 +01:00
Andrew Kingston 760733f071 Merge branch 'next' of github.com:Budibase/budibase into app-list 2021-05-06 14:01:03 +01:00
Andrew Kingston 69345b0c01 Move app list to admin portal 2021-05-06 13:59:06 +01:00
Andrew Kingston 845054a5b1 Add new file for common svelte actions 2021-05-06 13:58:42 +01:00
Andrew Kingston a44849c955 Add noPadding prop to Body 2021-05-06 13:58:23 +01:00
Andrew Kingston 8b300dbd12 Add XS gap class to Layout 2021-05-06 13:58:07 +01:00
Andrew Kingston 8088416ba5 Add quiet prop to BBUI select 2021-05-06 13:57:36 +01:00
Keviin Åberg Kultalahti 1d9387ebeb wip: skeleton for users page 2021-05-06 14:34:41 +02:00
Martin McKeaveney 361db5e96f update scoped config imports 2021-05-06 12:09:35 +01:00
Martin McKeaveney 23cb160a69 merge with next 2021-05-06 11:56:53 +01:00
Keviin Åberg Kultalahti 3d4fef4376 Merge branch 'next' into admin/user-management-ui 2021-05-06 12:56:46 +02:00
Michael Drury f823b73a47
Merge pull request #1449 from Budibase/feature/password-reset
Password reset and invitations backend
2021-05-06 11:04:15 +01:00
Martin McKeaveney 2fe2d521cf lint 2021-05-06 10:57:24 +01:00
Martin McKeaveney efacbe861a unit tests 2021-05-06 10:54:01 +01:00
mike12345567 02a270a24d Making some changes to how configs are scoped. 2021-05-06 10:51:21 +01:00
Andrew Kingston 058daeb57f Update avatar to solid background 2021-05-06 10:49:04 +01:00
Martin McKeaveney 7cad598269 refactor CSS 2021-05-06 10:30:38 +01:00
Martin McKeaveney 91bf0d7a98 budibase config checklist complete 2021-05-06 10:28:06 +01:00
Andrew Kingston 99a02eb94d Add skeleton for apps page as example of full width page 2021-05-06 10:22:36 +01:00
Andrew Kingston e576e464e2 Update existing pages to use Page layout component 2021-05-06 10:22:17 +01:00
Andrew Kingston efdac8bc66 Add default portal redirect 2021-05-06 10:18:41 +01:00
Andrew Kingston 61d81a719a Update core layout to allow full width pages and match designs 2021-05-06 10:18:25 +01:00
Andrew Kingston 67fad5def0 Update border colour definitions to match designs 2021-05-06 10:17:47 +01:00
Andrew Kingston 04dfbe4d18 Add Page layout component to BBUI 2021-05-06 10:17:27 +01:00
Keviin Åberg Kultalahti b3addde600 add manage subroute to host users, auth, email pages 2021-05-06 11:00:41 +02:00
Martin McKeaveney 32608eee45 merge 2021-05-06 09:17:05 +01:00
Martin McKeaveney 399c463f52 do not allow users to initialise again once an admin has been created 2021-05-05 22:06:31 +01:00
Martin McKeaveney 1aedba80bd first time setup E2E 2021-05-05 21:56:43 +01:00
Martin McKeaveney 4bc1a7dc3c renable worker protection 2021-05-05 20:59:16 +01:00
Martin McKeaveney 4377b41f40 endpoint for budibase configuration checklist 2021-05-05 20:58:31 +01:00
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
Martin McKeaveney 0525be382d basic UI for creating first admin user 2021-05-05 17:58:09 +01:00
Keviin Åberg Kultalahti f805cdfb07 lintfix 2021-05-05 18:53:38 +02:00
Keviin Åberg Kultalahti cd9af13668 moves admin store to `stores/portal` 2021-05-05 18:52:45 +02: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
Keviin Åberg Kultalahti 8d02e017df remove unneeded class 2021-05-05 18:45:18 +02:00
Keviin Åberg Kultalahti f84389c2e1 remove some unneeded after fixing _layout 2021-05-05 18:44:55 +02:00
Keviin Åberg Kultalahti 22885f185a fix merge conflict 2021-05-05 18:42:50 +02:00
Keviin Åberg Kultalahti 335aeeded4 format fixes 2021-05-05 18:41:42 +02:00
Keviin Åberg Kultalahti 2cfb2f349e lint fix 2021-05-05 18:41:16 +02:00
Keviin Åberg Kultalahti 141ab61828 merge next 2021-05-05 18:40:55 +02:00
Keviin Åberg Kultalahti a86961085f add analytics toggling 2021-05-05 18:39:36 +02:00
Keviin Åberg Kultalahti 31ed79c4e7 update org store and add loading state + notifications to save action 2021-05-05 18:30:03 +02:00
Martin McKeaveney c381f08b4a fix styling 2021-05-05 17:21:35 +01:00
Keviin Åberg Kultalahti e999f53291 introduces portal stores concept and adds an org one that handles configs 2021-05-05 17:50:45 +02: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
Keviin Åberg Kultalahti 4d7b102da1 fix SideNav Item not working correctly 2021-05-05 16:47:27 +02: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
Keviin Åberg Kultalahti 7a346bed29 move settings to a subpath 2021-05-05 12:56:12 +02:00
Martin McKeaveney 4e494b23c9 tidy up imports 2021-05-05 11:03:45 +01: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
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
mike12345567 c259564ba8 Merge branch 'next' of github.com:Budibase/budibase into labday/mike-formulas 2021-05-04 13:24:14 +01:00
Martin McKeaveney bb2f4f485b merge with next 2021-05-04 11:49:34 +01:00
Martin McKeaveney 187b1c5670 Merge branch 'next' of https://github.com/Budibase/budibase into lab-day/scripting-block 2021-05-04 11:42:13 +01:00
Martin McKeaveney a4cc4191b4 merge with next 2021-05-04 11:40:59 +01:00
Andrew Kingston 4f4fa0f9bc Fix progressbar using undefined variables 2021-05-04 11:37:53 +01:00
Andrew Kingston 556236ebce Add explicit prettier options 2021-05-04 11:32:22 +01:00
Andrew Kingston f13c4f4e90 Fix modal content size prop 2021-05-04 11:07:26 +01:00