Commit Graph

1288 Commits

Author SHA1 Message Date
Conor_Mack 42530d215e WIP: Select Scroll - Problems on scroll 2020-06-27 16:56:01 +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
Martin McKeaveney e293f3f70a adding renaming test 2020-06-26 09:55:15 +01: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
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
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
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
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
Michael Shanks 8b9c596fdc Merge branch 'master' of github.com:Budibase/budibase 2020-06-24 16:42:41 +01:00
Martin McKeaveney f1795d51ef fix test 2020-06-24 16:32:16 +01:00
Conor_Mack 4c7bdcded1 Lint fixes 2020-06-24 16:20:58 +01:00
Joe 9b8cc2a18f Formatting and linting 2020-06-24 16:20:15 +01:00
Conor_Mack fcff2d928a Cypress Tests and Discussion Resolves 2020-06-24 16:16:06 +01:00
Michael Shanks 14f8f6dcfc bugfix: cannot change container type 2020-06-24 16:16:01 +01:00
Martin McKeaveney 1f2c1a06aa lint 2020-06-24 16:12:55 +01:00
Martin McKeaveney 2c764a787c custom notifications solution 2020-06-24 16:10:54 +01:00
Michael Shanks 02e1898989 #381: Events: param input not displaying value 2020-06-24 15:55:40 +01:00
Joe 6259cdc7e6 Merge branch 'Css-update-to-reflect-BBUI' of https://github.com/Budibase/budibase into Css-update-to-reflect-BBUI 2020-06-24 15:46:30 +01:00
Joe 5b4132a8e6 formatting and linting 2020-06-24 15:41:33 +01:00
Joe 5b600c4f2b
Merge branch 'master' into Css-update-to-reflect-BBUI 2020-06-24 15:35:40 +01:00
Joe 027d81be29 Props panel updated
All design props tested
SImplification of design props completed, with, in some cases, the replacement of units with general terminology.
2020-06-24 15:06:28 +01:00
Martin McKeaveney 01d7f80e7b custom notifications, models + fields keyed by ID 2020-06-24 12:41:26 +01:00
Michael Shanks e3965f66d4 loading worklows into state along with appPackage 2020-06-24 11:59:07 +01:00
Michael Shanks 32115e784d event > workflow ..added default blank option to workflow dropdown 2020-06-24 11:58:46 +01:00
Michael Shanks 1112073d37 #381 Save Workflow button in worflow setup 2020-06-24 11:26:46 +01:00
Michael Shanks d8508f7e0a workflow: admin & p_user always have access 2020-06-24 11:22:18 +01:00