Commit Graph

1406 Commits

Author SHA1 Message Date
Joe 7ea1eaed06 Merge branch 'Css-update-to-reflect-BBUI' of https://github.com/Budibase/budibase into Css-update-to-reflect-BBUI 2020-06-24 15:46:30 +01:00
Joe ff8ec8e033 formatting and linting 2020-06-24 15:41:33 +01:00
Joe 0cf410b253 Merge branch 'master' into Css-update-to-reflect-BBUI 2020-06-24 15:35:40 +01:00
Joe 85b0d790a6 Props panel updated
All design props tested
SImplification of design props completed, with, in some cases, the replacement of units with general terminology.
2020-06-24 15:06:28 +01:00
kevmodrome 1c63a93234 more work on settings modal 2020-06-24 15:04:01 +02:00
Martin McKeaveney cde00356b3 custom notifications, models + fields keyed by ID 2020-06-24 12:41:26 +01:00
Michael Shanks 1f89dd4b36 loading worklows into state along with appPackage 2020-06-24 11:59:07 +01:00
Michael Shanks 6041003115 event > workflow ..added default blank option to workflow dropdown 2020-06-24 11:58:46 +01:00
Michael Shanks 393c63485f #381 Save Workflow button in worflow setup 2020-06-24 11:26:46 +01:00
Michael Shanks 83b640286d workflow: admin & p_user always have access 2020-06-24 11:22:18 +01:00
Michael Shanks 1c958c226a screenslot added to Private>Master by default 2020-06-24 11:05:09 +01:00
Martin McKeaveney e1b88e6620 enable renaming of records by using IDs 2020-06-23 23:26:54 +01:00
Joe d95c4c7a54 Selected pseudo class removed, workflow panels updated 2020-06-23 21:29:18 +01:00
Martin McKeaveney 83da838fcd lint 2020-06-23 16:20:06 +01:00
Martin McKeaveney 8ab2e0b6aa improvements to linked records 2020-06-23 13:50:45 +01:00
Conor_Mack 50ecfd1e25 Merge branch 'master' into builder/consolidating-missing-code 2020-06-23 11:21:31 +01:00
Joe 28fadac7f7 CSS update UI refresh
Font changed to Inter
Colors reflect BBUI
Panel background removed
2020-06-23 08:19:16 +01:00
Martin McKeaveney eca7b69949 merge 2020-06-22 22:39:41 +01:00
Michael Shanks c9afb9bee9 Merge pull request #376 from mjashanks/master
#363 bugfix: page not built until prop changed
2020-06-22 22:03:31 +01:00
Martin McKeaveney 430ca37826 bidirectional linked records 2020-06-22 21:30:23 +01:00
Michael Shanks c9b35508d9 #363 bugfix: page not built until prop changed 2020-06-22 21:16:51 +01:00
Victoria Sloan 16430cb798 linty 2020-06-22 18:07:52 +01:00
Victoria Sloan e643d6651f setting appId on user object when creating the app instance 2020-06-22 17:38:00 +01:00
kevmodrome dd5ca67dcd Merge branch 'master' of github.com:Budibase/budibase into feature/settings-modal 2020-06-22 17:55:40 +02:00
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
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 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
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 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 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
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
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 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
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 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
Conor_Mack 3dcef29ddd Instance name for components and screens 2020-06-11 16:15:09 +01:00
kevmodrome f5e3df09d6 make tests less brittle 2020-06-11 17:10:26 +02:00
kevmodrome 08162ec1d6 Merge branch 'master' into feature/add-e2e-tests 2020-06-11 16:41:14 +02:00
kevmodrome 87ce7e2c3b change package.json script temporarily 2020-06-11 16:40:45 +02:00
kevmodrome 7cf81c063a 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 f8cfc8e7d7 adding record models for brevity 2020-06-11 14:35:45 +01:00
Joe dd206338c2 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 9068bbc89c formatting and lint update 2020-06-11 13:15:19 +01:00
Joe a552772ccc Props update, including flex, border, shadow, rotate 2020-06-11 13:07:10 +01:00
kevmodrome b35fbe823c update names for tests 2020-06-11 13:20:13 +02:00
kevmodrome 59aaf33278 adds tests to add components and change props on them 2020-06-11 12:56:16 +02:00
kevmodrome 3ee5111d6f rework tests to use commands for DRYness 2020-06-11 12:04:31 +02:00
Michael Shanks 108fa4ca13 changed "master" databse to "clientAppLookup" 2020-06-11 10:12:01 +01:00
Michael Shanks 735d9c4475 lint fix 2020-06-10 21:41:55 +01:00
Michael Shanks 9a807beccb Merge branch 'master' of github.com:Budibase/budibase 2020-06-10 21:39:46 +01:00
Michael Shanks 71016f5a1d application supports multiple concurrent client DB 2020-06-10 21:39:30 +01:00
Joe f33947e501 Merge pull request #346 from Budibase/image-component
Image Component
2020-06-10 16:22:57 +01:00
Conor_Mack 8ec6d33a7d 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 f86494b47c Fix - No Page Props on Master Screen Components 2020-06-10 10:16:38 +01:00
Martin McKeaveney 8f7248a0d6 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 35aa2d341a Revert "Fixes for Screen and Page Props" 2020-06-09 19:18:45 +01:00
kevmodrome f1d968ae88 adds missing package.json commands 2020-06-09 15:48:25 +02:00
kevmodrome 8e685d07c1 add tests to create model and record 2020-06-09 15:40:14 +02:00
kevmodrome 5e1210723c update create app test 2020-06-09 15:40:00 +02:00
Martin McKeaveney a325ef2a8f fix spacing 2020-06-09 13:34:19 +01:00
Martin McKeaveney 96708ce75a preview app in new window 2020-06-09 13:30:01 +01:00
Conor_Mack 9adf9ee7bf 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
kevmodrome 0c9baf92f8 adds test for creating budibase app 2020-06-09 13:52:19 +02:00
kevmodrome 48c604d0d0 feat: adds cypress to the builder 2020-06-09 13:52:00 +02:00
Michael Shanks eea2dbf3b3 Merge pull request #344 from mjashanks/master
app preview improvements
2020-06-09 11:50:48 +01:00
Joe e32c4d15af formatting 2020-06-09 11:49:06 +01:00
Conor_Mack ce51796e30 Merge pull request #347 from Budibase/property-panel/remove-suffix-dependency
User can now specify suffix in the Input
2020-06-09 11:46:07 +01:00
Michael Shanks 1c1447011b preventDefault on clicks, in preview 2020-06-09 11:44:33 +01:00
Conor_Mack d029dc6a4d User can now specify suffix in the Input 2020-06-09 11:33:37 +01:00
Joe fc39ab7bc1 Image Component
Image component added to builder
2020-06-09 11:06:18 +01:00
Conor_Mack 119eae549a Linting 2020-06-09 11:02:47 +01:00
Conor_Mack dd0eec0592 Refactorings for page and settings props 2020-06-09 10:59:15 +01:00
kevmodrome d640f90e7b feat: move DetailSummary component in properties pane to bbui 2020-06-09 11:00:50 +02:00
Michael Shanks 5799fbf23f code review: add listner once 2020-06-09 06:22:00 +01:00
Conor_Mack ed1b30d83a Utils update and Jest Tests 2020-06-08 21:41:10 +01:00
Michael Shanks 7541ce91dd app preview improvements 2020-06-08 21:13:19 +01:00
kevmodrome 70df69a46d bump bbui version 2020-06-08 12:20:13 +02:00
kevmodrome a50bb3b0cc bump bbui version and rework homepage to use HomeLinks 2020-06-08 12:09:01 +02:00
Conor_Mack b136eaea17 Tidyup 2020-06-08 10:49:13 +01:00
Conor_Mack d7734fc0a4 Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/screen-page-testing 2020-06-08 10:48:57 +01:00
Joe 63fe1349c3 Data Components UI Update
Changes include:
Table UI updated, including color changes, margin, padding and height adjustments,
Table centered, title added, spacing improved
login - button text includes web app name
2020-06-05 15:08:03 +01:00
Martin McKeaveney 43856e968e moving workflow button 2020-06-04 20:24:12 +01:00
Joe 06542e4244 formatting 2020-06-04 19:30:44 +01:00
Joe e1c5cae376 Workflow UI update 2020-06-04 19:27:25 +01:00
Martin McKeaveney d53b0655af Merge pull request #327 from Budibase/fix-email
fix backend workflow
2020-06-04 14:08:11 +01:00
Martin McKeaveney b719880ffc fix backend workflow 2020-06-04 13:55:52 +01:00
Joe 36f47792ad Merge pull request #326 from Budibase/welcome-screen-UI-update
Welcome screen ui update
2020-06-04 13:17:18 +01:00
Joe 2dfb5f74e4 Merge pull request #323 from Budibase/event-panel-ui-update
Event panel ui update
2020-06-04 12:40:41 +01:00
Joe e00762cf59 Merge pull request #325 from Budibase/transition,-dataform,-decoration-fix
Transition fix, decoration added and dataform button font removed
2020-06-04 12:40:33 +01:00
Joe a0a5074150 Transition fix, decoration added and dataform button font removed 2020-06-04 12:22:01 +01:00
Michael Shanks 6aba0e4ee2 Merge branch 'master' into new-list-spike2 2020-06-04 11:57:05 +01:00
Michael Shanks bd3a7b41f7 "DataList" = old list, "List" = new list 2020-06-04 11:56:42 +01:00
Joe d09bbc1551 Welcome screen ui update
UI was not very responsive before and the illustration looked basic.

Image added, button moved, card ui updated with more margin and better sizing,
2020-06-04 11:56:01 +01:00
Joe 5b4dc75a02 Event panel ui update 2020-06-04 09:00:25 +01:00
kevmodrome db231d0ac0 Merge branch 'master' into feature/fix-events-modal 2020-06-04 09:28:35 +02:00
kevmodrome 46a2a63ef0 switch out input to use bbui 2020-06-04 09:26:50 +02:00
Michael Shanks db1242ce9e Merge branch 'data-form' 2020-06-03 23:14:12 +01:00
Michael Shanks 2bedbd5df6 bugfix: screenRouter hijacks link clicks and routes when applicable 2020-06-03 22:52:33 +01:00
Joe 9193029bc4 Form and button update 2020-06-03 22:49:55 +01:00
Michael Shanks 3471afe587 bugfix: data components hitting correct url again 2020-06-03 22:12:09 +01:00
Conor_Mack 9556598cc6 Fixes for screen and page props 2020-06-03 22:05:02 +01:00
Conor_Mack 156fc01b48 Screen and page latest 2020-06-03 21:36:36 +01:00
Martin McKeaveney 6452b68a7c fix budibase apps dir 2020-06-03 21:23:56 +01:00
Martin McKeaveney 651692eed3 Revert "Settings for Pages and Screens" 2020-06-03 21:10:48 +01:00
Martin McKeaveney b087a65e7e Merge pull request #316 from Budibase/fix-user-agent
use custom user agent header
2020-06-03 20:58:03 +01:00
Martin McKeaveney f5bcaa4ba0 fixing tests 2020-06-03 20:54:17 +01:00
Martin McKeaveney 18ad679d21 lint 2020-06-03 20:44:35 +01:00
Martin McKeaveney 1f64bf8d16 charttype prop for datachart 2020-06-03 20:38:46 +01:00
Martin McKeaveney 2cd309bfdc fix some other auth bugs 2020-06-03 20:35:30 +01:00
Conor_Mack e647ebd4a0 lint fix 2020-06-03 19:50:28 +01:00
Conor_Mack 62ac56b386 Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/screen-and-page-props 2020-06-03 19:48:35 +01:00
Conor_Mack 7309d18904 Settings Props for Pages and Screens 2020-06-03 19:46:41 +01:00
Martin McKeaveney 227df203f9 fixing header in tests 2020-06-03 19:39:53 +01:00
Martin McKeaveney 94731e017a use custom user agent header 2020-06-03 19:35:04 +01:00
Michael Shanks 70c24b5b1f test fixes... test didnt have user-agent 2020-06-03 17:21:49 +01:00
Michael Shanks a483004e1d Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 17:05:53 +01:00
Michael Shanks 6c2b72dd27 logic to not use builder:token for apps running in dev 2020-06-03 17:05:36 +01:00
Martin McKeaveney bb9ad9c1c6 Merge pull request #314 from Budibase/fix-dataform
fix dataform
2020-06-03 17:03:51 +01:00
Martin McKeaveney 02fac0774e updating page title prop 2020-06-03 16:44:01 +01:00
Conor_Mack 53dc3780fa Screen and page latest 2020-06-03 16:19:04 +01:00
Martin McKeaveney 2f6e0f14ae fix dataform 2020-06-03 16:10:03 +01:00
Joe f413c7531c Merge pull request #313 from Budibase/login-logo-update
login logo update
2020-06-03 15:59:30 +01:00
Joe 695cac39c7 login logo update 2020-06-03 15:55:42 +01:00
Michael Shanks 3e9a3ec678 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 15:43:53 +01:00
Michael Shanks bae6a37b5d autu populated login page 2020-06-03 15:43:37 +01:00
Joe 63ed718293 Merge pull request #311 from Budibase/login-component-UI
login component UI update
2020-06-03 15:21:43 +01:00
Joe 6c680c5d21 login component UI update
Input styles updates
Labels removed
Button redesigned
Title/name added to ui and settings

*Logo and preview broke for login component and page - Another issue
2020-06-03 15:13:39 +01:00
Kevin Åberg Kultalahti f3866a5e0d Merge pull request #309 from Budibase/bugfix/navbar-settings
Bugfix/navbar settings
2020-06-03 14:59:35 +02:00
kevmodrome d165f3e90b fixes lint issues 2020-06-03 14:55:29 +02:00
kevmodrome 4f291e2f73 adds another color to Nav Bar and also adds roboto as default font in created apps 2020-06-03 14:52:18 +02:00
kevmodrome 60424c6f0e adds options to navbar component 2020-06-03 14:36:39 +02:00
Martin McKeaveney 7818a2ec57 Merge pull request #307 from Budibase/electron-fix
electron path fix
2020-06-03 12:42:44 +01:00
Michael Shanks 63a87066c7 Workflow model selector - blank option 2020-06-03 12:33:57 +01:00
Michael Shanks bc5240e117 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 12:30:54 +01:00
Michael Shanks 06e9f9fd07 StateBindingCascader - nod handling onChange 2020-06-03 12:30:48 +01:00
Michael Shanks 82d0f1ea86 bugfix: links not respecting appRootPath 2020-06-03 12:30:32 +01:00
Joe 6a3a7c5e87 Removed unused images and added new BB logo 2020-06-03 12:21:26 +01:00
Martin McKeaveney 9b6ea6a5eb electron path fix 2020-06-03 12:05:40 +01:00