Commit Graph

23516 Commits

Author SHA1 Message Date
Conor_Mack efb80347c6 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
Conor_Mack f9448f14a1 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
Martin McKeaveney 949052c41c 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 1b313efd98 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
Conor_Mack 4a00e2257f 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 bda580bc3f 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
Martin McKeaveney 78ce077846 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
Conor_Mack b95fdd458f 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
Martin McKeaveney 11db99a123 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 dbc490994b 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
Conor_Mack 8bae0e49c5 Lint fix 2020-06-15 18:39:10 +01:00
Martin McKeaveney 5d46c572b8 lint 2020-06-15 17:08:59 +01:00
Martin McKeaveney 34b27b83bb lint 2020-06-15 17:08:59 +01:00
Martin McKeaveney f70407b6eb budibase dockerfile 2020-06-15 17:06:54 +01:00
Martin McKeaveney 594b7c2cce 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
Martin McKeaveney af9038f64f 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 3bcd93d490 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
Conor_Mack c1e9133424 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 77544089ce 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
kevmodrome 93031566aa 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 f0ee729376 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 ea3a8fd81a 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 5174c3f1dc 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 5b59a110a6 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 f956e141b4 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 42166e01a5 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 509a628581 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