Commit Graph

1987 Commits

Author SHA1 Message Date
Michael Shanks 3692b92e5b merge from master 2020-06-26 15:41:42 +01:00
Joe 13ee292417 formatting and linting 2020-06-26 14:38:29 +01:00
Joe 91f562ee8c UI Update
Button color changed
Background color in the settings panel removed
Workflow items font color fixed
Spacing improved
2020-06-26 14:32:45 +01:00
Conor_Mack f6713053e8
Merge pull request #393 from Budibase/colorpicker/fixing-broken-colorpicker
Fixing Colorpicker Duplication Issues
2020-06-26 12:03:09 +01:00
Conor_Mack b7670bcc6a Fixing Colorpicker Duplication Issues 2020-06-26 11:53:08 +01:00
Martin McKeaveney 961226a63f
Merge pull request #391 from Budibase/data-model-redesign
Data model redesign
2020-06-26 10:56:07 +01:00
Conor_Mack 08524ab5d8
Merge pull request #392 from Budibase/bugfix/instance-name-login-template
Add _instanceName to login template
2020-06-26 10:35:42 +01:00
Conor_Mack fcdfddf6da Add _instanceName to login template 2020-06-26 10:31:03 +01:00
kevmodrome e4fc3e57d1 adds update functionality to users 2020-06-26 11:05:09 +02:00
kevmodrome 5c532e1543 sets up frontend side of updating users 2020-06-26 11:04:50 +02:00
Martin McKeaveney e293f3f70a adding renaming test 2020-06-26 09:55:15 +01:00
kevmodrome 46192f6505 add back settingslink that was accidently removed 2020-06-26 09:19:37 +02:00
kevmodrome df1c1463b3 Merge branch 'master' of github.com:Budibase/budibase into feature/settings-modal 2020-06-26 09:02:16 +02:00
Martin McKeaveney fb382329b8 lint 2020-06-25 22:43:10 +01:00
Martin McKeaveney 63fc10e1e0 tidy up 2020-06-25 22:35:52 +01:00
Martin McKeaveney 6ef4ba086c data model rewrite 2020-06-25 22:34:38 +01:00
Martin McKeaveney 66aa2008c9 linked records matched up by name 2020-06-25 20:35:03 +01:00
Martin McKeaveney 48f3392152 record keys as names 2020-06-25 20:04:58 +01:00
Martin McKeaveney b07f608ffe merge 2020-06-25 18:32:51 +01:00
Michael Shanks 6ad45027d5 Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-25 17:48:24 +01:00
Michael Shanks 8ce26a1e19 bugfix: master screen not styleable 2020-06-25 17:46:43 +01:00
Michael Shanks fc1a81083d bugfix: margin-bottom not set correctly 2020-06-25 17:24:31 +01:00
Michael Shanks 1cfa4d4b22 bugfix: duplicate controls inside colorpicker 2020-06-25 16:58:53 +01:00
Joe a43e0a1131
Merge pull request #389 from Budibase/Backend-UI-update
General UI fixing previous styling issues
2020-06-25 16:07:36 +01:00
Joe dcfa39ef67 Formatting 2020-06-25 16:02:30 +01:00
Martin McKeaveney d640871ecf
Merge pull request #388 from Budibase/backend-bugs
fix date field
2020-06-25 15:59:16 +01:00
Joe d9a48e3a51 General UI fixing previous styling issues 2020-06-25 15:49:56 +01:00
Martin McKeaveney 3384a11a06 date field 2020-06-25 14:36:27 +01:00
kevmodrome 68e1441b83 adds functionality to check list of users and add users in settings modal 2020-06-25 14:25:17 +02:00
kevmodrome 69c85ce3d7 bump bbui 2020-06-25 12:41:27 +02:00
kevmodrome 106b28ced6 change spacing var to be hardcoded 2020-06-25 12:41:22 +02:00
Michael Shanks be5f957f2b yarn lock 2020-06-25 10:41:07 +01:00
Michael Shanks 8bc33a6790 bugfix: duplicate model created when we click save twice 2020-06-25 10:41:00 +01:00
Michael Shanks af826be155
Merge pull request #384 from mjashanks/master
Bugfixes
2020-06-24 18:14:11 +01:00
Michael Shanks ec1c9c5fb8 merge from master 2020-06-24 18:05:49 +01:00
Michael Shanks 0a58f861e1 removed console log 2020-06-24 17:47:44 +01:00
Michael Shanks 2cca2a3535 updated bbui version 2020-06-24 17:45:23 +01:00
Martin McKeaveney 6cdd933d09
Merge pull request #367 from Budibase/backend-ui-update
Backend ui update
2020-06-24 17:33:22 +01:00
Martin McKeaveney 5a7fa51907 test fix 2020-06-24 17:26:14 +01:00
Michael Shanks ef3e802fad Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-24 17:19:29 +01:00
Martin McKeaveney e42c807ded tidy up 2020-06-24 17:19:12 +01:00
Martin McKeaveney 69c6a86ccd renamed colours 2020-06-24 17:13:16 +01:00
Conor_Mack 9898ee0b99
Merge pull request #360 from Budibase/builder/consolidating-missing-code
Instance name fix and consolidation of code
2020-06-24 17:11:08 +01:00
Conor_Mack 323256cabf Remove Comments 2020-06-24 17:05:49 +01:00
Martin McKeaveney 65d0454377 merge 2020-06-24 17:02:38 +01:00
Michael Shanks b7de07057f Merge branch 'master' of github.com:Budibase/budibase 2020-06-24 17:02:08 +01:00
Michael Shanks ca8098a690
Merge pull request #385 from mjashanks/revert_login
reverting login change from previous commit
2020-06-24 17:01:31 +01:00
Conor_Mack b9d7cfdec1 Cypress Tests - Use Get Timeouts 2020-06-24 16:58:30 +01:00
Michael Shanks 9df4f2aa39 reverting login change from previous commit 2020-06-24 16:57:21 +01:00
Martin McKeaveney ee86d6fb16 update when linked field added 2020-06-24 16:56:13 +01:00