Commit Graph

20083 Commits

Author SHA1 Message Date
Michael Shanks fee2b0f908 Merge branch 'data-form' 2020-06-03 23:14:12 +01:00
Michael Shanks db1242ce9e 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
Michael Shanks 2bedbd5df6 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
Joe 9193029bc4 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
Michael Shanks 3471afe587 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 9556598cc6 Fixes for screen and page props 2020-06-03 22:05:02 +01:00
Martin McKeaveney fae0b2d932
Merge pull request #319 from Budibase/fix-budibase-dir
fix budibase apps dir
2020-06-03 21:39:29 +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
Conor_Mack 9ab0cedff2 Screen and page latest 2020-06-03 21:36:36 +01:00
Conor_Mack 156fc01b48 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 6452b68a7c fix budibase apps dir 2020-06-03 21:23:56 +01:00
Martin McKeaveney 5aa75ac9a2
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 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 98050f4c2a
Revert "Settings for Pages and Screens" 2020-06-03 21:10:48 +01:00
Martin McKeaveney 651692eed3 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 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 9581bec421 fixing tests 2020-06-03 20:54:17 +01:00
Martin McKeaveney f5bcaa4ba0 fixing tests 2020-06-03 20:54:17 +01:00
Martin McKeaveney e74c685956 lint 2020-06-03 20:44:35 +01:00
Martin McKeaveney 18ad679d21 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 1f64bf8d16 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
Martin McKeaveney 2cd309bfdc fix some other auth bugs 2020-06-03 20:35:30 +01:00
Conor_Mack eb850547ab
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 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 b14d010cc2 lint fix 2020-06-03 19:50:28 +01:00
Conor_Mack e647ebd4a0 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 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 2aaec0222c Settings Props for Pages and Screens 2020-06-03 19:46:41 +01:00
Conor_Mack 7309d18904 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 227df203f9 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
Martin McKeaveney 94731e017a use custom user agent header 2020-06-03 19:35:04 +01:00
Michael Shanks a49d383176
Merge pull request #315 from mjashanks/master
Ignore builder:token for apps
2020-06-03 17:47:30 +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 583f024754 test fixes... test didnt have user-agent 2020-06-03 17:21:49 +01:00
Michael Shanks 70c24b5b1f 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 a483004e1d 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
Michael Shanks 6c2b72dd27 logic to not use builder:token for apps running in dev 2020-06-03 17:05:36 +01:00