Commit Graph

1290 Commits

Author SHA1 Message Date
Conor_Mack 37ed95fa96
Merge branch 'master' into builder/consolidating-missing-code 2020-06-16 12:17:32 +01:00
Conor_Mack ab15bd479c Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/colorpicker 2020-06-16 09:58:48 +01:00
Conor_Mack 903e6331a4 Lint fix 2020-06-15 18:39:10 +01:00
Martin McKeaveney 5d46c572b8 lint 2020-06-15 17:08:59 +01:00
Martin McKeaveney f70407b6eb budibase dockerfile 2020-06-15 17:06:54 +01:00
Martin McKeaveney 48f6ac2b98 structuring new backend UI 2020-06-15 16:41:31 +01:00
Conor_Mack 47d38f2a28 Lint fixes 2020-06-15 16:02:11 +01:00
Conor_Mack 8b99546326 Instance naming fix for components and screens 2020-06-15 16:01:24 +01:00
kevmodrome 318c7ecb3b 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 30f054090f code review - static controller - test app id with regex 2020-06-14 20:36:51 +01:00
Michael Shanks f3ba6552f0 client: fixing broken tests 2020-06-14 20:30:23 +01:00
Michael Shanks ac00a47d23 build errors from dodgy merge 2020-06-12 21:20:44 +01:00
Michael Shanks 3b506f59cb lint fix 2020-06-12 21:11:39 +01:00
Michael Shanks 6c8a0dc8f2 fixing tests - not using new auth endpoint 2020-06-12 21:08:00 +01:00
Michael Shanks ad4de714f6 accidentally commited cypress folder 2020-06-12 21:04:30 +01:00
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 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
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 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 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 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 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
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
kevmodrome b9e8319670 adds test for creating budibase app 2020-06-09 13:52:19 +02:00
kevmodrome 3e967da6d0 feat: adds cypress to the builder 2020-06-09 13:52:00 +02:00
Michael Shanks bacf4c8f41
Merge pull request #344 from mjashanks/master
app preview improvements
2020-06-09 11:50:48 +01:00
Joe 67868eb9d3 formatting 2020-06-09 11:49:06 +01:00
Conor_Mack 92eb39cc45
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 dc8c22e018 preventDefault on clicks, in preview 2020-06-09 11:44:33 +01:00
Conor_Mack e32b179fb5 User can now specify suffix in the Input 2020-06-09 11:33:37 +01:00
Joe bd908a6e67 Image Component
Image component added to builder
2020-06-09 11:06:18 +01:00
Conor_Mack 4b3f171c5d Linting 2020-06-09 11:02:47 +01:00
Conor_Mack 50f4007d0d Refactorings for page and settings props 2020-06-09 10:59:15 +01:00
kevmodrome f770bd7033 feat: move DetailSummary component in properties pane to bbui 2020-06-09 11:00:50 +02:00
Michael Shanks eea966a6ae code review: add listner once 2020-06-09 06:22:00 +01:00
Conor_Mack 98710bffbe Utils update and Jest Tests 2020-06-08 21:41:10 +01:00
Michael Shanks 2a2d9812b2 app preview improvements 2020-06-08 21:13:19 +01:00
kevmodrome fd6c720ee6 bump bbui version 2020-06-08 12:20:13 +02:00
kevmodrome b83b8c6fbe bump bbui version and rework homepage to use HomeLinks 2020-06-08 12:09:01 +02:00
Conor_Mack 241b3028e9 Tidyup 2020-06-08 10:49:13 +01:00
Conor_Mack 2911ccc8ba Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/screen-page-testing 2020-06-08 10:48:57 +01:00
Joe 7b25f559c0 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 76956fc898 moving workflow button 2020-06-04 20:24:12 +01:00
Joe 0e6a62f730 formatting 2020-06-04 19:30:44 +01:00
Joe d7a66048c4 Workflow UI update 2020-06-04 19:27:25 +01:00
Martin McKeaveney 53427bcdfc
Merge pull request #327 from Budibase/fix-email
fix backend workflow
2020-06-04 14:08:11 +01:00
Martin McKeaveney a92ab5cabb fix backend workflow 2020-06-04 13:55:52 +01:00
Joe 8fe00cb803
Merge pull request #326 from Budibase/welcome-screen-UI-update
Welcome screen ui update
2020-06-04 13:17:18 +01:00
Joe f2760d05ad
Merge pull request #323 from Budibase/event-panel-ui-update
Event panel ui update
2020-06-04 12:40:41 +01:00
Joe 87c7d698bc
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 0638c5b9b8 Transition fix, decoration added and dataform button font removed 2020-06-04 12:22:01 +01:00
Michael Shanks cd29fd9862 Merge branch 'master' into new-list-spike2 2020-06-04 11:57:05 +01:00
Michael Shanks db0624b01b "DataList" = old list, "List" = new list 2020-06-04 11:56:42 +01:00
Joe c5b6356219 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 530004f7c3 Event panel ui update 2020-06-04 09:00:25 +01:00
kevmodrome c2f1c792fe Merge branch 'master' into feature/fix-events-modal 2020-06-04 09:28:35 +02:00
kevmodrome cc44ca3e54 switch out input to use bbui 2020-06-04 09:26:50 +02:00
Michael Shanks fee2b0f908 Merge branch 'data-form' 2020-06-03 23:14:12 +01:00
Michael Shanks 5fa8e3ca63 bugfix: screenRouter hijacks link clicks and routes when applicable 2020-06-03 22:52:33 +01:00
Joe 94a9868427 Form and button update 2020-06-03 22:49:55 +01:00
Michael Shanks 32d1ca641b bugfix: data components hitting correct url again 2020-06-03 22:12:09 +01:00
Conor_Mack 0d6ee860df Fixes for screen and page props 2020-06-03 22:05:02 +01:00
Conor_Mack 9ab0cedff2 Screen and page latest 2020-06-03 21:36:36 +01:00
Martin McKeaveney fb2e873e2f fix budibase apps dir 2020-06-03 21:23:56 +01:00
Martin McKeaveney 98050f4c2a
Revert "Settings for Pages and Screens" 2020-06-03 21:10:48 +01:00
Martin McKeaveney e4cc5656ae
Merge pull request #316 from Budibase/fix-user-agent
use custom user agent header
2020-06-03 20:58:03 +01:00
Martin McKeaveney 9581bec421 fixing tests 2020-06-03 20:54:17 +01:00
Martin McKeaveney e74c685956 lint 2020-06-03 20:44:35 +01:00
Martin McKeaveney 71f9b4f832 charttype prop for datachart 2020-06-03 20:38:46 +01:00
Martin McKeaveney 0482bc242c fix some other auth bugs 2020-06-03 20:35:30 +01:00
Conor_Mack b14d010cc2 lint fix 2020-06-03 19:50:28 +01:00
Conor_Mack 058b31b397 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 2aaec0222c Settings Props for Pages and Screens 2020-06-03 19:46:41 +01:00
Martin McKeaveney 3d95f4cd58 fixing header in tests 2020-06-03 19:39:53 +01:00
Martin McKeaveney 07cf98b0de use custom user agent header 2020-06-03 19:35:04 +01:00
Michael Shanks 583f024754 test fixes... test didnt have user-agent 2020-06-03 17:21:49 +01:00
Michael Shanks 87f8a9c108 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 17:05:53 +01:00
Michael Shanks 47162d806b logic to not use builder:token for apps running in dev 2020-06-03 17:05:36 +01:00
Martin McKeaveney 9ec8e71624
Merge pull request #314 from Budibase/fix-dataform
fix dataform
2020-06-03 17:03:51 +01:00
Martin McKeaveney ca0d1b6b2b updating page title prop 2020-06-03 16:44:01 +01:00
Conor_Mack 65ee282a2c Screen and page latest 2020-06-03 16:19:04 +01:00
Martin McKeaveney f939d9ef13 fix dataform 2020-06-03 16:10:03 +01:00
Joe f3362503d7
Merge pull request #313 from Budibase/login-logo-update
login logo update
2020-06-03 15:59:30 +01:00
Joe 1c3a37a23e login logo update 2020-06-03 15:55:42 +01:00
Michael Shanks 47f80b24f7 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 15:43:53 +01:00
Michael Shanks 77a16f95da autu populated login page 2020-06-03 15:43:37 +01:00
Joe 0241fb7e91
Merge pull request #311 from Budibase/login-component-UI
login component UI update
2020-06-03 15:21:43 +01:00
Joe 8e3d823401 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 b8df2f15fb
Merge pull request #309 from Budibase/bugfix/navbar-settings
Bugfix/navbar settings
2020-06-03 14:59:35 +02:00
kevmodrome f187758147 fixes lint issues 2020-06-03 14:55:29 +02:00
kevmodrome dba1ff1de1 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 0aa9aece0b adds options to navbar component 2020-06-03 14:36:39 +02:00
Martin McKeaveney 62d63051f0
Merge pull request #307 from Budibase/electron-fix
electron path fix
2020-06-03 12:42:44 +01:00
Michael Shanks c10c1bed08 Workflow model selector - blank option 2020-06-03 12:33:57 +01:00
Michael Shanks b8df49e948 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 12:30:54 +01:00
Michael Shanks b272174270 StateBindingCascader - nod handling onChange 2020-06-03 12:30:48 +01:00
Michael Shanks 0c2d7a7c66 bugfix: links not respecting appRootPath 2020-06-03 12:30:32 +01:00
Joe 7f656bc28b Removed unused images and added new BB logo 2020-06-03 12:21:26 +01:00
Martin McKeaveney de8010cdf5 electron path fix 2020-06-03 12:05:40 +01:00
Michael Shanks f10e08fee3 replace DataList with new List 2020-06-03 09:25:56 +01:00
Michael Shanks bff3cac99e Merge branch 'master' into new-list-spike 2020-06-03 09:22:43 +01:00
Michael Shanks 6ca887e79e ModelSelect - added blank option 2020-06-03 06:55:21 +01:00
Michael Shanks c81ffe04d4 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 06:36:42 +01:00
Michael Shanks 4ee546d2c7
Merge pull request #299 from Budibase/backend-modal-ui-update
Backend modal UI update
2020-06-03 06:35:39 +01:00
Michael Shanks 5323ad3c1e
Merge pull request #300 from Budibase/fix-data-components
fix datalist, datatable and chart component
2020-06-03 06:35:26 +01:00
Michael Shanks 9c258da579 spike - list that accepts children 2020-06-02 23:26:06 +01:00
Martin McKeaveney 10ecb8d732 fix datalist, datatable and chart component 2020-06-02 21:31:29 +01:00
Joe 3faaf94554 formatting update 2020-06-02 21:13:19 +01:00
Joe b726363c34 Add User Model Update 2020-06-02 21:12:33 +01:00
Joe a416ecc789 formatting 2020-06-02 20:56:16 +01:00
Joe 63882727de Defeat
I stand defeated to UIKit and its CSS shackles
2020-06-02 20:55:15 +01:00
Joe 6fcc3ad163 Backend modal UI update
Models include:
Create new view
Create new model
Create new field
Create new user
2020-06-02 19:59:58 +01:00
Michael Shanks ceb21acb53 Merge branch 'master' of github.com:Budibase/budibase 2020-06-02 17:08:05 +01:00
Martin McKeaveney 81d45a149f
Merge pull request #298 from Budibase/fix-login
fix login component
2020-06-02 17:07:44 +01:00
Martin McKeaveney 425028dfea fix login component 2020-06-02 16:46:37 +01:00