Commit Graph

4009 Commits

Author SHA1 Message Date
Andrew Kingston 2e68f51b8f Fix selected row state not resetting properly 2020-12-09 11:31:50 +00:00
kevmodrome a300120b96
adds colorpicker to card componeent 2020-12-09 12:00:17 +01:00
mike12345567 40d855df10 Updating row controller to make sure that all user requests (bar deletion) are passed through correctly to the user controller so that any logic such as removing user password can be correctly held in the user controller logic. 2020-12-09 10:54:30 +00:00
mike12345567 c490e97573 Updating row controller to make sure that all user requests (bar deletion) are passed through correctly to the user controller so that any logic such as removing user password can be correctly held in the user controller logic. 2020-12-09 10:52:18 +00:00
mike12345567 3a2a1a504d Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-09 10:02:33 +00:00
Martin McKeaveney 8783a43281
Merge pull request #900 from Budibase/pre-release
Pre release
2020-12-09 09:07:32 +00:00
Martin McKeaveney e48be7a109 further tidy up 2020-12-08 18:57:19 +00:00
mike12345567 2928a379b0 Updating builder/server in a few ways, to allow creating users with extra columns attached, allowing password to be updated in the builder and making sure that all row endpoints correctly pass through the user controller so that we can still have customised functionality for users (such as making sure password is never returned). 2020-12-08 17:33:08 +00:00
Martin McKeaveney f355a16ca4 fixing bugs found during testing 2020-12-08 16:55:43 +00:00
mike12345567 f9d2e4e4e1 Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-08 16:12:29 +00:00
Andrew Kingston c9514cefc6 Sort routes to ensure the client router always matches correctly 2020-12-08 15:44:35 +00:00
Andrew Kingston e472150f30 Sort path groupings 2020-12-08 15:34:15 +00:00
Andrew Kingston 36ca1143e1 Fix bug which caused autolinks to not be generated 2020-12-08 15:21:01 +00:00
Andrew Kingston 0f1ae6a28a Fix indentation level in screen and layout trees 2020-12-08 15:11:26 +00:00
Andrew Kingston 4a8d8f3da9 Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/security-update 2020-12-08 14:03:56 +00:00
Andrew Kingston 882092784a Add custom renderer for user roles to show pretty names 2020-12-08 14:03:47 +00:00
mike12345567 1f8e5006ad Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/self-hosting 2020-12-08 13:45:53 +00:00
mike12345567 bc399df6fd Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 13:41:07 +00:00
Andrew Kingston 9054a8014a Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 13:16:53 +00:00
mike12345567 57029e737b Fixing an issue with power user not being usable. 2020-12-08 12:20:37 +00:00
Martin McKeaveney c16764d0c5
Merge pull request #898 from Budibase/feature/page-refactor
Feature/page refactor
2020-12-08 11:56:50 +00:00
mike12345567 130f69caf5 Fixing automations to use recurseMustache from utilities. 2020-12-08 11:47:33 +00:00
Andrew Kingston d0f2d4c2cd Update user editing to support new email field 2020-12-08 11:43:37 +00:00
Andrew Kingston 1acdcd173c Merge branch 'master' of github.com:Budibase/budibase into feature/security-update 2020-12-08 11:42:29 +00:00
Martin McKeaveney 71fa39ef7e lint 2020-12-08 11:23:06 +00:00
Martin McKeaveney a2318238ae Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-08 11:12:27 +00:00
Martin McKeaveney cbfe0f8409 lint 2020-12-08 11:07:16 +00:00
Martin McKeaveney 642437e5be
Merge branch 'master' into feature/page-refactor 2020-12-08 10:48:14 +00:00
Martin McKeaveney 5f7ed62a77 Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor 2020-12-08 10:32:52 +00:00
Martin McKeaveney ae00e54d91 Different names for home and login screen 2020-12-08 10:32:45 +00:00
Andrew Kingston df37177239 Tidy up builder preview iframe 2020-12-08 10:16:01 +00:00
Andrew Kingston 2657008b14 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 0a9f6c3d33 Remove client bundle from being packaged with the builder 2020-12-08 10:14:02 +00:00
Michael Drury e2dd3d4b81
Merge pull request #899 from Budibase/feature/chain-automations
Feature/chain automations
2020-12-08 09:49:31 +00:00
Martin McKeaveney efe50230e7 merge with master 2020-12-07 21:32:45 +00:00
Martin McKeaveney 1c40c3dbdd rename level to role in test 2020-12-07 21:28:16 +00:00
Martin McKeaveney d8aa699bfa merge 2020-12-07 21:20:35 +00:00
Martin McKeaveney ab9c594de9
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 2123c06df5 fix tests 2020-12-07 21:11:07 +00:00
Martin McKeaveney 0e837899a4 code review 2020-12-07 20:46:37 +00:00
Martin McKeaveney 6e664b3795 fix layout bugs, some tidy up 2020-12-07 20:29:41 +00:00
Andrew Kingston e7c929ed84 Add custom modal for creating and editing users 2020-12-07 19:05:39 +00:00
mike12345567 e4ef92555c Merge branch 'username-email' of github.com:Budibase/budibase into feature/security-update 2020-12-07 18:08:20 +00:00
mike12345567 8a57f61607 Fixing test case and also making sure that external trigger does what its expected to. 2020-12-07 17:55:35 +00:00
mike12345567 bc9a8ef0e3 Updating test so that it doesn't chain. 2020-12-07 17:42:31 +00:00
mike12345567 616f3bc81c Linting. 2020-12-07 17:24:10 +00:00
mike12345567 5c084599ec Making chaining of automations through different row creation/deletions possible. 2020-12-07 17:23:53 +00:00
Martin McKeaveney 32d5a83b09 remove dupe import 2020-12-07 16:06:50 +00:00
Martin McKeaveney a014db4185 fix layout selection issues 2020-12-07 16:06:20 +00:00
Andrew Kingston a3dd9f1978 Remove log statement 2020-12-07 15:59:37 +00:00