Commit Graph

1619 Commits

Author SHA1 Message Date
Martin McKeaveney 7428dd40fc backend v1 - styling to do 2020-06-18 17:17:18 +01:00
Michael Shanks bf14aa5ccb instanceid removal 2020-06-18 16:59:31 +01:00
Conor_Mack 1f719cba9d Merge pull request #366 from Budibase/property-panel/colorpicker
UI Updates for Colorpicker Component
2020-06-18 16:17:35 +01:00
Conor_Mack ad0840545e Updates for Colorpicker Component 2020-06-18 15:54:18 +01:00
Martin McKeaveney cc1cab0e57 Merge branch 'master' of github.com:Budibase/budibase into backend-ui-update 2020-06-18 09:16:43 +01:00
Conor_Mack b5cb6a2aea Merge pull request #364 from Budibase/property-panel/colorpicker
Integrating Colorpicker with Builder
2020-06-17 17:57:35 +01:00
Conor_Mack 06f3c1db77 Removing unused asString 2020-06-17 17:50:23 +01:00
Conor_Mack efb80347c6 Lint and test fixes 2020-06-17 17:44:47 +01:00
Conor_Mack f9448f14a1 Lint fix 2020-06-17 16:57:38 +01:00
Martin McKeaveney 949052c41c add new models and fields, delete models 2020-06-17 16:51:10 +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 4a00e2257f Integrating Colorpicker with Builder 2020-06-17 16:46:03 +01:00
Martin McKeaveney bda580bc3f new model creation, requires styling and CSS updates 2020-06-16 20:53:13 +01:00
Martin McKeaveney 78ce077846 saving of models and fields 2020-06-16 20:29:18 +01:00
Conor_Mack b95fdd458f Merge branch 'master' into builder/consolidating-missing-code 2020-06-16 12:17:32 +01:00
Martin McKeaveney 11db99a123 Merge pull request #361 from Budibase/dockerfile
budibase dockerfile
2020-06-16 10:29:24 +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 8bae0e49c5 Lint fix 2020-06-15 18:39:10 +01:00
Martin McKeaveney 34b27b83bb lint 2020-06-15 17:08:59 +01:00
Martin McKeaveney 594b7c2cce budibase dockerfile 2020-06-15 17:06:54 +01:00
Martin McKeaveney af9038f64f structuring new backend UI 2020-06-15 16:41:31 +01:00
Conor_Mack 3bcd93d490 Lint fixes 2020-06-15 16:02:11 +01:00
Conor_Mack c1e9133424 Instance naming fix for components and screens 2020-06-15 16:01:24 +01: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 93031566aa removes unused file 2020-06-15 10:14:58 +02:00
Michael Shanks f0ee729376 code review - static controller - test app id with regex 2020-06-14 20:36:51 +01:00
Michael Shanks ea3a8fd81a client: fixing broken tests 2020-06-14 20:30:23 +01:00
Michael Shanks 5174c3f1dc build errors from dodgy merge 2020-06-12 21:20:44 +01:00
Michael Shanks 5b59a110a6 lint fix 2020-06-12 21:11:39 +01:00
Michael Shanks f956e141b4 fixing tests - not using new auth endpoint 2020-06-12 21:08:00 +01:00
Michael Shanks 42166e01a5 accidentally commited cypress folder 2020-06-12 21:04:30 +01:00
Michael Shanks 509a628581 merge from master 2020-06-12 20:50:17 +01:00
Michael Shanks 19d132c6c2 removal of appRoot - appId comes in cookie 2020-06-12 20:42:55 +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 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 71c6d737d9 Merge branch 'master' of github.com:Budibase/budibase 2020-06-12 12:15:32 +01:00
Michael Shanks 0c35f46b5f bugfix - screen/page > settings throwing error 2020-06-12 12:15:17 +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 ebc47a9b1b Fully functional Colorpicker with Preview 2020-06-12 10:48:20 +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 ce6ca5351d changed setup to require CLI modules directly 2020-06-11 20:37:01 +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 4ed4866bca update _rev for deleted test model 2020-06-11 18:11:56 +01:00
Martin McKeaveney 2b312d4c1f lint 2020-06-11 17:28:19 +01:00
Martin McKeaveney 3900b216e9 remove other link fields when you delete a model 2020-06-11 17:24:09 +01:00
kevmodrome 47762bd0d5 update instructions in contributing 2020-06-11 18:15:29 +02:00
kevmodrome 7a65da7899 fix linting errors 2020-06-11 18:14:28 +02:00
kevmodrome 5d84ceb7f6 update script to be sync rather than async 2020-06-11 18:10:53 +02:00
kevmodrome 59442f18cb adds script to run cypress tests 2020-06-11 17:59:11 +02:00
Martin McKeaveney a49747074a Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-06-11 16:22:28 +01:00