Commit Graph

1296 Commits

Author SHA1 Message Date
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
Kevin Åberg Kultalahti 6c279fab8d Merge pull request #322 from Budibase/feature/fix-events-modal
Feature/fix events modal
2020-06-04 09:33:41 +02: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 1f9846ab2f Merge pull request #321 from Budibase/data-form
Form and button update
2020-06-03 23:18:54 +01: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
Martin McKeaveney 45f4ab1568 Merge pull request #319 from Budibase/fix-budibase-dir
fix budibase apps dir
2020-06-03 21:39:29 +01:00
Martin McKeaveney 6452b68a7c fix budibase apps dir 2020-06-03 21:23:56 +01:00
Martin McKeaveney 6c60076f42 Merge pull request #318 from Budibase/revert-317-property-panel/screen-and-page-props
Revert "Settings for Pages and Screens"
2020-06-03 21:12:13 +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 a0ff57dc75 Merge pull request #317 from Budibase/property-panel/screen-and-page-props
Settings for Pages and Screens
2020-06-03 19:55:53 +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 6a8090f69b Merge pull request #315 from mjashanks/master
Ignore builder:token for apps
2020-06-03 17:47:30 +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 629e3154c6 Merge pull request #312 from mjashanks/master
Auto populated login page
2020-06-03 15:54:13 +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 a0aa7400c1 Merge pull request #301 from mjashanks/master
Few Bugfixes
2020-06-03 12:38:02 +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