Commit Graph

2254 Commits

Author SHA1 Message Date
Victoria Sloan 37c47cc124 setting appId on user object when creating the app instance 2020-06-22 17:38:00 +01:00
kevmodrome 823df59e32 Merge branch 'master' of github.com:Budibase/budibase into feature/settings-modal 2020-06-22 17:55:40 +02:00
Conor_Mack 85ccd878ce
Merge pull request #374 from Budibase/property-panel/colorpicker
Colorpicker - Swatch Panel, Logic and UI Updates
2020-06-22 16:43:25 +01:00
Conor_Mack a0416bd067 Swatch Panel, Logic and UI Updates 2020-06-22 16:32:57 +01:00
Michael Shanks a21fe80da3
Merge pull request #348 from Budibase/feature/add-e2e-tests
Adds integration tests using Cypress

**NOTE**

When adding to CI, we need to add a `yarn build` step. Think that the client library is not being built.
2020-06-22 16:16:39 +01:00
kevmodrome b7003e9a18 remove cookies set up in each test and rely on cookie default added before 2020-06-22 16:39:28 +02:00
Michael Shanks 243948bc93 cypress - changed background test to font-size
(so i dont have to figure out how to test the colour picker)
2020-06-22 11:29:34 +01:00
Michael Shanks 733dd9753c cypress - retain "builder:token" cookie between tests 2020-06-22 10:53:17 +01:00
Michael Shanks fab5832425 lint fix 2020-06-21 21:41:10 +01:00
Michael Shanks a69fdbfc16 cypress tests - run on windows 2020-06-21 21:26:53 +01:00
Michael Shanks c88f4d2541 removed debug message 2020-06-21 21:21:24 +01:00
Michael Shanks 48d60a7183 removed ADMIN_SECRET env var (no longer needed) 2020-06-21 20:54:37 +01:00
Michael Shanks ede3f7e9aa Merge branch 'master' into feature/add-e2e-tests 2020-06-21 20:30:44 +01:00
Michael Shanks 62a0bdc057
Merge pull request #368 from mjashanks/instanceid-url-removal
Remove Instance ID from URLS + appRootPath Removal
2020-06-21 20:27:36 +01:00
Michael Shanks f44f3ec375 bugfix:Dataform throwing error 2020-06-21 06:01:29 +01:00
Michael Shanks e4c19bd9fd bugfix: workflow still passing instanceId to api() 2020-06-20 20:30:00 +01:00
Michael Shanks 44c8ca8b58 Merge branch 'master' into instanceid-url-removal 2020-06-19 17:22:29 +01:00
Michael Shanks 69a36895e7 codereview: looksLikeAppId as variable 2020-06-19 17:21:24 +01:00
Michael Shanks 4dcd482a4f instance Id is gone from API module 2020-06-19 17:19:30 +01:00
Conor_Mack c80f9f8819 Recent Colors and UI Updates 2020-06-19 17:07:11 +01:00
Michael Shanks d7b09f5b65 removed x-user-agent 2020-06-19 16:59:46 +01:00
kevmodrome a50dd46a97 adds integration design 2020-06-19 15:50:39 +02:00
kevmodrome 0e1faab61c bump bbui 2020-06-19 14:32:48 +02:00
kevmodrome 663f90b78d merge in new bbui css stuff 2020-06-19 13:44:41 +02:00
Kevin Åberg Kultalahti 597104f4a2
Merge pull request #370 from Budibase/feature/add-bbui-css
adds bbui.css file
2020-06-19 13:42:12 +02:00
kevmodrome 315f621770 adds bbui.css file 2020-06-19 13:36:03 +02:00
kevmodrome c9a49e4d4b bump bbui and add DangerZone design 2020-06-19 12:51:02 +02:00
kevmodrome 3d6860a79f bump bbui 2020-06-19 12:20:02 +02:00
kevmodrome 310b41c4b3 adds General tab design and updates bbui 2020-06-19 12:09:27 +02:00
kevmodrome 482d791b96 Sets up tabbed modal for settings 2020-06-19 09:14:03 +02:00
Michael Shanks 849fcfe819 client - should recognise new cookie format 2020-06-19 07:04:55 +01:00
Michael Shanks 11e56467b8 fixing broken tests 2020-06-18 20:41:37 +01:00
Martin McKeaveney 099e394270 lint 2020-06-18 17:55:46 +01:00
Martin McKeaveney 9cdb6554a5 typo 2020-06-18 17:49:34 +01:00
Martin McKeaveney d2fbddadd5 save button 2020-06-18 17:44:42 +01:00
Martin McKeaveney 7c4f24c1b4 backend v1 - styling to do 2020-06-18 17:17:18 +01:00
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