Commit Graph

2238 Commits

Author SHA1 Message Date
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
kevmodrome 40dfde522b make tests less brittle 2020-06-11 17:10:26 +02:00
kevmodrome 39093f3ce6 Merge branch 'master' into feature/add-e2e-tests 2020-06-11 16:41:14 +02:00
kevmodrome 5640f03fff change package.json script temporarily 2020-06-11 16:40:45 +02:00
kevmodrome 5140069ed6 adds some data-cy properties to a number of elements and starts work on workflow tests 2020-06-11 16:40:07 +02:00
Martin McKeaveney d2477e1b81 adding record models for brevity 2020-06-11 14:35:45 +01:00
Joe 02469dec2f
Merge pull request #354 from Budibase/Props-update-Shadow-fix,-rotate-improved,-border-updated
Props update, including flex, border, shadow, rotate
2020-06-11 13:26:41 +01:00
Joe b603e27bc4 formatting and lint update 2020-06-11 13:15:19 +01:00
Joe 3f77e0a0ba Props update, including flex, border, shadow, rotate 2020-06-11 13:07:10 +01:00
kevmodrome 0ab7b99f41 update names for tests 2020-06-11 13:20:13 +02:00
kevmodrome b473604bc4 adds tests to add components and change props on them 2020-06-11 12:56:16 +02:00
kevmodrome 202abaa13e rework tests to use commands for DRYness 2020-06-11 12:04:31 +02:00
Michael Shanks df9a098439
Merge pull request #353 from mjashanks/master
Server now support multiple concurrent client databses
2020-06-11 10:36:31 +01:00
Michael Shanks 6cb7e995a2 changed "master" databse to "clientAppLookup" 2020-06-11 10:12:01 +01:00
Michael Shanks eddda1d675 lint fix 2020-06-10 21:41:55 +01:00
Michael Shanks fb1f9af0d3 Merge branch 'master' of github.com:Budibase/budibase 2020-06-10 21:39:46 +01:00
Michael Shanks 2d4321177f application supports multiple concurrent client DB 2020-06-10 21:39:30 +01:00
Joe 9773985008
Merge pull request #346 from Budibase/image-component
Image Component
2020-06-10 16:22:57 +01:00
Conor_Mack 19b2611534
Merge pull request #351 from Budibase/property-panel/screen-page-testing
Property panel/screen page testing
2020-06-10 15:45:09 +01:00
Conor_Mack 7eca5a501d Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/screen-page-testing 2020-06-10 10:19:58 +01:00
Conor_Mack 96d52bf6e8 Fix - No Page Props on Master Screen Components 2020-06-10 10:16:38 +01:00
Martin McKeaveney d73d1a4dcb
Merge pull request #349 from Budibase/open-app-in-new-window
preview app in new window when running electron
2020-06-09 19:21:53 +01:00
Martin McKeaveney 1f4e8ff036
Merge pull request #350 from Budibase/revert-341-property-panel/screen-page-testing
Revert "Fixes for Screen and Page Props"
2020-06-09 19:18:55 +01:00
Martin McKeaveney eff761053c
Revert "Fixes for Screen and Page Props" 2020-06-09 19:18:45 +01:00
kevmodrome 989b042993 adds missing package.json commands 2020-06-09 15:48:25 +02:00
kevmodrome 0c20d328ae add tests to create model and record 2020-06-09 15:40:14 +02:00
kevmodrome e4fded7114 update create app test 2020-06-09 15:40:00 +02:00
kevmodrome e0e6be8aa3 setup commands to allow running tests from project root instead of just builder package 2020-06-09 15:39:50 +02:00
Martin McKeaveney d9fe761dd6 fix spacing 2020-06-09 13:34:19 +01:00
Martin McKeaveney cb8ba23742 preview app in new window 2020-06-09 13:30:01 +01:00
Conor_Mack 0f72fff186
Merge pull request #341 from Budibase/property-panel/screen-page-testing
Fixes for Screen and Page Props
2020-06-09 13:02:13 +01:00