Commit Graph

3594 Commits

Author SHA1 Message Date
mike12345567 a3a8f01452 Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-08 16:12:29 +00:00
Andrew Kingston a926b23720 Sort routes to ensure the client router always matches correctly 2020-12-08 15:44:35 +00:00
Andrew Kingston 3c6be9d481 Sort path groupings 2020-12-08 15:34:15 +00:00
Andrew Kingston ff3e79696d Fix bug which caused autolinks to not be generated 2020-12-08 15:21:01 +00:00
Andrew Kingston e16e909c65 Fix indentation level in screen and layout trees 2020-12-08 15:11:26 +00:00
Andrew Kingston d223515d6c Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/security-update 2020-12-08 14:03:56 +00:00
Andrew Kingston 495427082f Add custom renderer for user roles to show pretty names 2020-12-08 14:03:47 +00:00
mike12345567 2ad44fe60a Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-08 13:45:53 +00:00
mike12345567 48e40cde99 Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 13:41:07 +00:00
Andrew Kingston 77f049d1bd Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 13:16:53 +00:00
mike12345567 79cfc5ea01 Fixing an issue with power user not being usable. 2020-12-08 12:20:37 +00:00
Martin McKeaveney f16efc9b0c Merge pull request #898 from Budibase/feature/page-refactor
Feature/page refactor
2020-12-08 11:56:50 +00:00
mike12345567 9a63252666 Fixing automations to use recurseMustache from utilities. 2020-12-08 11:47:33 +00:00
Andrew Kingston 1c73786226 Update user editing to support new email field 2020-12-08 11:43:37 +00:00
Andrew Kingston b7cb7c59a0 Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 11:42:29 +00:00
Martin McKeaveney b7f628e250 lint 2020-12-08 11:23:06 +00:00
Martin McKeaveney 1a226214e9 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-08 11:12:27 +00:00
Martin McKeaveney 994f87e82b lint 2020-12-08 11:07:16 +00:00
Martin McKeaveney 5f0aa7e584 Merge branch 'master' into feature/page-refactor 2020-12-08 10:48:14 +00:00
Martin McKeaveney 3af1b7bad7 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-08 10:32:52 +00:00
Martin McKeaveney a803ee8f71 Different names for home and login screen 2020-12-08 10:32:45 +00:00
Andrew Kingston fd207af6ad Tidy up builder preview iframe 2020-12-08 10:16:01 +00:00
Andrew Kingston 5130bdf3cd Improve handling of routes and screens. Fix issue which could prevent logging in depending on order of screens in app definition 2020-12-08 10:15:33 +00:00
Andrew Kingston 88e6da5e49 Remove client bundle from being packaged with the builder 2020-12-08 10:14:02 +00:00
Michael Drury beb99a84e8 Merge pull request #899 from Budibase/feature/chain-automations
Feature/chain automations
2020-12-08 09:49:31 +00:00
Martin McKeaveney 7fc7500fa3 merge with master 2020-12-07 21:32:45 +00:00
Martin McKeaveney c00af29fbc rename level to role in test 2020-12-07 21:28:16 +00:00
Martin McKeaveney 39473cb029 merge 2020-12-07 21:20:35 +00:00
Martin McKeaveney f73c321ef4 Merge pull request #893 from Budibase/username-email
Replace username with email across the board
2020-12-07 21:18:16 +00:00
Martin McKeaveney cffa809316 fix tests 2020-12-07 21:11:07 +00:00
Martin McKeaveney ccb6b59588 code review 2020-12-07 20:46:37 +00:00
Martin McKeaveney a7789067d3 fix layout bugs, some tidy up 2020-12-07 20:29:41 +00:00
Andrew Kingston b70512ada2 Add custom modal for creating and editing users 2020-12-07 19:05:39 +00:00
mike12345567 74f5197865 Merge branch 'username-email' of github.com:Budibase/budibase into feature/security-update 2020-12-07 18:08:20 +00:00
mike12345567 837778c250 Fixing test case and also making sure that external trigger does what its expected to. 2020-12-07 17:55:35 +00:00
mike12345567 ed292db82e Updating test so that it doesn't chain. 2020-12-07 17:42:31 +00:00
mike12345567 a9c2f7f20b Linting. 2020-12-07 17:24:10 +00:00
mike12345567 63f38ce99d Making chaining of automations through different row creation/deletions possible. 2020-12-07 17:23:53 +00:00
Martin McKeaveney a104e5c1e7 remove dupe import 2020-12-07 16:06:50 +00:00
Martin McKeaveney bc6ae452d1 fix layout selection issues 2020-12-07 16:06:20 +00:00
Andrew Kingston 4ddc61faa3 Remove log statement 2020-12-07 15:59:37 +00:00
Andrew Kingston 6d6b89b522 Fix crash when changing screen layout 2020-12-07 15:59:19 +00:00
Martin McKeaveney 3af5ec36b8 merge 2020-12-07 15:53:51 +00:00
Martin McKeaveney 74f138ee9a lint 2020-12-07 15:49:19 +00:00
Martin McKeaveney a9d0c68a60 component store refactor - remove concept of currentPreviewItem and currentComponentInfo 2020-12-07 15:27:46 +00:00
mike12345567 3339f364b6 Updating role constraints and making sure roles can't be deleted if they are in use. 2020-12-07 15:21:06 +00:00
Andrew Kingston f8f7a73a67 Fix URLs when clicking on screens 2020-12-07 10:32:58 +00:00
Martin McKeaveney 6b5c1ffafa consolidate routing and component selection 2020-12-05 12:09:58 +00:00
Martin McKeaveney 40f6093198 allow renaming of layouts 2020-12-05 09:43:00 +00:00
Martin McKeaveney 64c4f0d300 deletion and error handling of layouts 2020-12-04 23:42:22 +00:00