Commit Graph

24938 Commits

Author SHA1 Message Date
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
Michael Shanks 19d132c6c2 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
Conor_Mack 6cf34a4ad8 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 6ff9d56acb 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 71c6d737d9 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
Michael Shanks 0c35f46b5f 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
Martin McKeaveney 8f745bcb68 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
Conor_Mack ebc47a9b1b 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
Martin McKeaveney 5ce3b53986 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
Michael Shanks ce6ca5351d 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 9830725ac1 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 4ed4866bca 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 2b312d4c1f 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
Martin McKeaveney 3900b216e9 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 47762bd0d5 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