Commit Graph

1618 Commits

Author SHA1 Message Date
Michael Shanks bf952f8677 instanceid removal 2020-06-18 16:59:31 +01:00
Conor_Mack ea2c10fc1d
Merge pull request #366 from Budibase/property-panel/colorpicker
UI Updates for Colorpicker Component
2020-06-18 16:17:35 +01:00
Conor_Mack d8ac7296c3 Updates for Colorpicker Component 2020-06-18 15:54:18 +01:00
Martin McKeaveney 6e187943c4 Merge branch 'master' of github.com:Budibase/budibase into backend-ui-update 2020-06-18 09:16:43 +01:00
Conor_Mack fbed66aac4
Merge pull request #364 from Budibase/property-panel/colorpicker
Integrating Colorpicker with Builder
2020-06-17 17:57:35 +01:00
Conor_Mack 869c8de816 Removing unused asString 2020-06-17 17:50:23 +01:00
Conor_Mack a7f7d32c06 Lint and test fixes 2020-06-17 17:44:47 +01:00
Conor_Mack 2db5dcfae2 Lint fix 2020-06-17 16:57:38 +01:00
Martin McKeaveney 5f8d6bbfe4 add new models and fields, delete models 2020-06-17 16:51:10 +01:00
Conor_Mack c00b572e22 Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/colorpicker 2020-06-17 16:46:21 +01:00
Conor_Mack ab5b7ccb39 Integrating Colorpicker with Builder 2020-06-17 16:46:03 +01:00
Martin McKeaveney 374a6b4bc6 new model creation, requires styling and CSS updates 2020-06-16 20:53:13 +01:00
Martin McKeaveney 987135f7b4 saving of models and fields 2020-06-16 20:29:18 +01:00
Conor_Mack 37ed95fa96
Merge branch 'master' into builder/consolidating-missing-code 2020-06-16 12:17:32 +01:00
Martin McKeaveney 35f16ff737
Merge pull request #361 from Budibase/dockerfile
budibase dockerfile
2020-06-16 10:29:24 +01:00
Conor_Mack ab15bd479c Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/colorpicker 2020-06-16 09:58:48 +01:00
Conor_Mack 903e6331a4 Lint fix 2020-06-15 18:39:10 +01:00
Martin McKeaveney 5d46c572b8 lint 2020-06-15 17:08:59 +01:00
Martin McKeaveney f70407b6eb budibase dockerfile 2020-06-15 17:06:54 +01:00
Martin McKeaveney 48f6ac2b98 structuring new backend UI 2020-06-15 16:41:31 +01:00
Conor_Mack 47d38f2a28 Lint fixes 2020-06-15 16:02:11 +01:00
Conor_Mack 8b99546326 Instance naming fix for components and screens 2020-06-15 16:01:24 +01:00
kevmodrome 318c7ecb3b adds ignore pattern to jest config so that it doesn't try to run cypress tests as unit tests 2020-06-15 10:41:38 +02:00
kevmodrome 5672caae69 removes unused file 2020-06-15 10:14:58 +02:00
Michael Shanks 30f054090f code review - static controller - test app id with regex 2020-06-14 20:36:51 +01:00
Michael Shanks f3ba6552f0 client: fixing broken tests 2020-06-14 20:30:23 +01:00
Michael Shanks ac00a47d23 build errors from dodgy merge 2020-06-12 21:20:44 +01:00
Michael Shanks 3b506f59cb lint fix 2020-06-12 21:11:39 +01:00
Michael Shanks 6c8a0dc8f2 fixing tests - not using new auth endpoint 2020-06-12 21:08:00 +01:00
Michael Shanks ad4de714f6 accidentally commited cypress folder 2020-06-12 21:04:30 +01:00
Michael Shanks 237b79e7e7 merge from master 2020-06-12 20:50:17 +01:00
Michael Shanks bf1da9e94e removal of appRoot - appId comes in cookie 2020-06-12 20:42:55 +01:00
Conor_Mack 2b0436eb99 Merge branch 'master' of https://github.com/Budibase/budibase into builder/consolidating-missing-code 2020-06-12 13:40:27 +01:00
Michael Shanks 3509e0743d
Merge pull request #357 from mjashanks/master
Bugfix: Screen and Page Props throwing error on Settings panel
2020-06-12 12:36:35 +01:00
Michael Shanks 2a50d2f3c4 Merge branch 'master' of github.com:Budibase/budibase 2020-06-12 12:15:32 +01:00
Michael Shanks c5c8309b09 bugfix - screen/page > settings throwing error 2020-06-12 12:15:17 +01:00
Martin McKeaveney 624a5c5d81
Merge pull request #355 from Budibase/linked-records
Linked Records - backend
2020-06-12 10:55:26 +01:00
Conor_Mack 8fd475dec2 Fully functional Colorpicker with Preview 2020-06-12 10:48:20 +01:00
Martin McKeaveney 872a578953
Merge pull request #356 from Budibase/unauth-pages
embed component, rename main and login to public and private
2020-06-12 09:58:21 +01:00
Michael Shanks 2ecb03e7ce changed setup to require CLI modules directly 2020-06-11 20:37:01 +01:00
Martin McKeaveney 6f1ea30fe6 embed component, rename main and login to public and private 2020-06-11 20:18:59 +01:00
Martin McKeaveney 8b3ce41ba7 update _rev for deleted test model 2020-06-11 18:11:56 +01:00
Martin McKeaveney 3f0465a892 lint 2020-06-11 17:28:19 +01:00
Martin McKeaveney 1c1ac8f1a3 remove other link fields when you delete a model 2020-06-11 17:24:09 +01:00
kevmodrome eb178f3fac update instructions in contributing 2020-06-11 18:15:29 +02:00
kevmodrome e68ce5e87e fix linting errors 2020-06-11 18:14:28 +02:00
kevmodrome 7bd45fd683 update script to be sync rather than async 2020-06-11 18:10:53 +02:00
kevmodrome d0178ed6b5 adds script to run cypress tests 2020-06-11 17:59:11 +02:00
Martin McKeaveney 0634c5718a Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-06-11 16:22:28 +01:00
Conor_Mack 32ff7a5c89 Instance name for components and screens 2020-06-11 16:15:09 +01:00