Commit Graph

1519 Commits

Author SHA1 Message Date
Michael Shanks 4677e76f79 merge from master 2020-06-26 15:41:42 +01:00
Conor_Mack 5f78d599fc Merge pull request #393 from Budibase/colorpicker/fixing-broken-colorpicker
Fixing Colorpicker Duplication Issues
2020-06-26 12:03:09 +01:00
Conor_Mack 1c1dfb1dfe Fixing Colorpicker Duplication Issues 2020-06-26 11:53:08 +01:00
Martin McKeaveney 5b7e310ff6 Merge pull request #391 from Budibase/data-model-redesign
Data model redesign
2020-06-26 10:56:07 +01:00
Conor_Mack 4be1cd07b3 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 818ab3b4fc Add _instanceName to login template 2020-06-26 10:31:03 +01:00
Martin McKeaveney a597232814 adding renaming test 2020-06-26 09:55:15 +01:00
Martin McKeaveney dd0b66be69 lint 2020-06-25 22:43:10 +01:00
Martin McKeaveney 5b1b6382c6 tidy up 2020-06-25 22:35:52 +01:00
Martin McKeaveney 28b951e993 data model rewrite 2020-06-25 22:34:38 +01:00
Martin McKeaveney a7cd637087 linked records matched up by name 2020-06-25 20:35:03 +01:00
Martin McKeaveney 28c5756047 record keys as names 2020-06-25 20:04:58 +01:00
Martin McKeaveney 92beb8ffa4 merge 2020-06-25 18:32:51 +01:00
Michael Shanks 51229f14c4 Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-25 17:48:24 +01:00
Michael Shanks 6592157527 bugfix: master screen not styleable 2020-06-25 17:46:43 +01:00
Michael Shanks 3eedff15a6 bugfix: margin-bottom not set correctly 2020-06-25 17:24:31 +01:00
Michael Shanks 3dfcf56a14 bugfix: duplicate controls inside colorpicker 2020-06-25 16:58:53 +01:00
Joe 2a5d8cebd0 Merge pull request #389 from Budibase/Backend-UI-update
General UI fixing previous styling issues
2020-06-25 16:07:36 +01:00
Joe 919412df8c Formatting 2020-06-25 16:02:30 +01:00
Martin McKeaveney d53b889ad9 Merge pull request #388 from Budibase/backend-bugs
fix date field
2020-06-25 15:59:16 +01:00
Joe 7c98a466e4 General UI fixing previous styling issues 2020-06-25 15:49:56 +01:00
Martin McKeaveney 4300a311f4 date field 2020-06-25 14:36:27 +01:00
Michael Shanks 4836092c20 yarn lock 2020-06-25 10:41:07 +01:00
Michael Shanks 4315d25d66 bugfix: duplicate model created when we click save twice 2020-06-25 10:41:00 +01:00
Michael Shanks 51d9f23aee Merge pull request #384 from mjashanks/master
Bugfixes
2020-06-24 18:14:11 +01:00
Michael Shanks ef94892a1b merge from master 2020-06-24 18:05:49 +01:00
Michael Shanks 9cbda3a748 removed console log 2020-06-24 17:47:44 +01:00
Michael Shanks 9fc870d9b9 updated bbui version 2020-06-24 17:45:23 +01:00
Martin McKeaveney ba74c0981e Merge pull request #367 from Budibase/backend-ui-update
Backend ui update
2020-06-24 17:33:22 +01:00
Martin McKeaveney 52358e93ad test fix 2020-06-24 17:26:14 +01:00
Michael Shanks 7f1f702cc4 Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-24 17:19:29 +01:00
Martin McKeaveney d32df44ae0 tidy up 2020-06-24 17:19:12 +01:00
Martin McKeaveney 9d829b2a8e renamed colours 2020-06-24 17:13:16 +01:00
Conor_Mack 7f543bdf26 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 13a2accda2 Remove Comments 2020-06-24 17:05:49 +01:00
Martin McKeaveney 835b21e387 merge 2020-06-24 17:02:38 +01:00
Michael Shanks b70d15e8b9 Merge branch 'master' of github.com:Budibase/budibase 2020-06-24 17:02:08 +01:00
Michael Shanks 0a0e8821d7 Merge pull request #385 from mjashanks/revert_login
reverting login change from previous commit
2020-06-24 17:01:31 +01:00
Conor_Mack ff3e922e22 Cypress Tests - Use Get Timeouts 2020-06-24 16:58:30 +01:00
Michael Shanks 7b807f40f1 reverting login change from previous commit 2020-06-24 16:57:21 +01:00
Martin McKeaveney 35a1b1c03e update when linked field added 2020-06-24 16:56:13 +01:00
Michael Shanks 59afd2c572 Merge branch 'master' of github.com:Budibase/budibase 2020-06-24 16:42:41 +01:00
Joe 83fba4a6f8 Merge pull request #378 from Budibase/Css-update-to-reflect-BBUI
WIP: UI refresh
2020-06-24 16:34:07 +01:00
Martin McKeaveney db16af3937 fix test 2020-06-24 16:32:16 +01:00
Conor_Mack df5a9ee87a Lint fixes 2020-06-24 16:20:58 +01:00
Joe 942af74bbd Formatting and linting 2020-06-24 16:20:15 +01:00
Conor_Mack 306c733094 Cypress Tests and Discussion Resolves 2020-06-24 16:16:06 +01:00
Michael Shanks 8b3d637292 bugfix: cannot change container type 2020-06-24 16:16:01 +01:00
Martin McKeaveney c46ccd05f9 lint 2020-06-24 16:12:55 +01:00
Martin McKeaveney 31e89e77e5 custom notifications solution 2020-06-24 16:10:54 +01:00