Commit Graph

8252 Commits

Author SHA1 Message Date
Conor_Mack 71a2124441 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 897a0a875b Swatch Panel, Logic and UI Updates 2020-06-22 16:32:57 +01:00
Michael Shanks 3fb266a2ba 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 9670a0cb5c remove cookies set up in each test and rely on cookie default added before 2020-06-22 16:39:28 +02:00
Michael Shanks a29f821802 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 a1df978b80 cypress - retain "builder:token" cookie between tests 2020-06-22 10:53:17 +01:00
Michael Shanks d424c3ff52 lint fix 2020-06-21 21:41:10 +01:00
Michael Shanks 8acdda053d cypress tests - run on windows 2020-06-21 21:26:53 +01:00
Michael Shanks 0ff6cc75e7 removed debug message 2020-06-21 21:21:24 +01:00
Michael Shanks bf89f3c403 removed ADMIN_SECRET env var (no longer needed) 2020-06-21 20:54:37 +01:00
Michael Shanks 39f22ff834 Merge branch 'master' into feature/add-e2e-tests 2020-06-21 20:30:44 +01:00
Michael Shanks 5d0b24f07d 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 ff2c2340e2 bugfix:Dataform throwing error 2020-06-21 06:01:29 +01:00
Michael Shanks af0ed48774 bugfix: workflow still passing instanceId to api() 2020-06-20 20:30:00 +01:00
Michael Shanks e41e2c3fad Merge branch 'master' into instanceid-url-removal 2020-06-19 17:22:29 +01:00
Michael Shanks 31f8d3bee2 codereview: looksLikeAppId as variable 2020-06-19 17:21:24 +01:00
Michael Shanks 4ba1329983 instance Id is gone from API module 2020-06-19 17:19:30 +01:00
Conor_Mack bf9b8e49f9 Recent Colors and UI Updates 2020-06-19 17:07:11 +01:00
Michael Shanks eb2b6ec56f removed x-user-agent 2020-06-19 16:59:46 +01:00
kevmodrome ed6f7699f0 adds integration design 2020-06-19 15:50:39 +02:00
kevmodrome d0648bd30d bump bbui 2020-06-19 14:32:48 +02:00
kevmodrome e3eb4519cf merge in new bbui css stuff 2020-06-19 13:44:41 +02:00
Kevin Åberg Kultalahti 7812bad567 Merge pull request #370 from Budibase/feature/add-bbui-css
adds bbui.css file
2020-06-19 13:42:12 +02:00
kevmodrome 06fd91cfab adds bbui.css file 2020-06-19 13:36:03 +02:00
kevmodrome 1c524f1f68 bump bbui and add DangerZone design 2020-06-19 12:51:02 +02:00
kevmodrome dc08455489 bump bbui 2020-06-19 12:20:02 +02:00
kevmodrome be45e180dd adds General tab design and updates bbui 2020-06-19 12:09:27 +02:00
kevmodrome 237165dcd9 Sets up tabbed modal for settings 2020-06-19 09:14:03 +02:00
Michael Shanks bd927564b2 client - should recognise new cookie format 2020-06-19 07:04:55 +01:00
Michael Shanks 2436ea525d fixing broken tests 2020-06-18 20:41:37 +01:00
Martin McKeaveney 2ac15c6b89 lint 2020-06-18 17:55:46 +01:00
Martin McKeaveney cada9bdb85 typo 2020-06-18 17:49:34 +01:00
Martin McKeaveney f8c9cc4331 save button 2020-06-18 17:44:42 +01:00
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