Commit Graph

7673 Commits (9399ad7f27ac563bf5197fdb395bbe8ade97fbef)

Author SHA1 Message Date
Rick Carlino 5f054bb5aa
Merge pull request #1091 from gabrielburnworth/staging
Regimen parameter support
2019-01-11 12:37:52 -06:00
gabrielburnworth 6ed190a983 regimen parameter support 2019-01-11 09:56:11 -08:00
Rick Carlino 4b6a36cd1a
Merge pull request #1090 from RickCarlino/regimen_params
Allow `parameter_declaration`s in Regimens
2019-01-11 11:04:16 -06:00
Rick Carlino b64715edc8
Merge branch 'staging' into regimen_params 2019-01-11 10:23:25 -06:00
Rick Carlino 926e2c4f7f Allow `parameter_declaration`s in Regimina 2019-01-11 10:20:36 -06:00
Rick Carlino 08fc227b34
Merge pull request #1089 from RickCarlino/dont_track_support_tables
Dont track support tables
2019-01-11 10:05:38 -06:00
Rick Carlino 5756556d27 Do NOT auto_sync internal tables 2019-01-11 09:47:47 -06:00
Rick Carlino 5d50625f01 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into regimen_variables 2019-01-11 07:25:55 -06:00
Rick Carlino 01de514db3
Merge pull request #1088 from gabrielburnworth/staging
Add variable form to Regimens
2019-01-11 07:16:51 -06:00
gabrielburnworth c24634522b fix partial overwrite bug 2019-01-10 20:36:06 -08:00
gabrielburnworth 540422df0e add regimen variables UI 2019-01-10 20:31:20 -08:00
Rick Carlino a260c7d09b Typo 2019-01-10 16:57:51 -06:00
Rick Carlino acd764ab1e
Merge pull request #1086 from RickCarlino/regimen_variables
Ability to use variables with Regimens (API only)
2019-01-10 13:22:48 -06:00
Rick Carlino 6d4fa5350c
Merge branch 'staging' into regimen_variables 2019-01-10 11:57:18 -06:00
Rick Carlino 02db39efa5 Use `internal_regimen` for regimens, not `internal_farm_event` 2019-01-10 11:55:06 -06:00
Rick Carlino 5e3017cc10 First draft of regimen level variables ✔️ 2019-01-10 11:45:26 -06:00
Rick Carlino 11e09800a5 Remove transitional helpers, add `body` to Regimens. NEXT: Test RegimenCon#update 2019-01-10 09:16:19 -06:00
Rick Carlino 21e6639c01
Merge pull request #1085 from gabrielburnworth/staging
Farmware installation package name
2019-01-10 07:22:00 -06:00
gabrielburnworth ccc495a026 use package name 2019-01-09 18:29:01 -08:00
gabrielburnworth bf849b7179 doc widget 2019-01-09 18:28:37 -08:00
Rick Carlino 3fe29dd014
Merge pull request #1084 from RickCarlino/populate_package_name
Update FarmwareInstallationSerializer
2019-01-09 18:12:38 -06:00
Rick Carlino b05aed8e19 Update FarmwareInstallationSerializer 2019-01-09 16:08:39 -06:00
Rick Carlino 54463791ab WIP 2019-01-09 16:02:40 -06:00
Rick Carlino a48b9adda5
Merge pull request #1083 from RickCarlino/populate_package_name
Fetch `farmware_installation.packge` from remote server
2019-01-09 14:44:17 -06:00
Rick Carlino 8f22688890 First draft of farmware package name fetcher 2019-01-09 13:48:41 -06:00
Rick Carlino 2b418db5cf
Merge pull request #1081 from gabrielburnworth/staging
Dep updates
2019-01-08 14:21:47 -06:00
Gabriel Burnworth 35e4f38f5a
Merge branch 'staging' into staging 2019-01-08 10:11:21 -08:00
Rick Carlino a30a0eebdd
Merge pull request #1082 from RickCarlino/location_group
Location groups (API-only)
2019-01-08 12:06:00 -06:00
Rick Carlino aa4d4d098c Add tests for `every_point` edge case 2019-01-08 11:50:01 -06:00
Rick Carlino b1310e3127 Type errors 2019-01-08 10:44:55 -06:00
Rick Carlino c4f9600436 Typo 2019-01-08 10:25:17 -06:00
Rick Carlino 0224ce6d65 Move to group of points (API-only) 2019-01-08 10:19:52 -06:00
Rick Carlino f2704db2d8 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into friday 2019-01-08 09:29:07 -06:00
gabrielburnworth 69ebee1fdb fix status stash bug 2019-01-07 21:22:10 -08:00
gabrielburnworth e2f9220714 fix network state manual throttle bug 2019-01-07 21:21:48 -08:00
gabrielburnworth 607a26759d major version dep updates 2019-01-07 20:01:40 -08:00
gabrielburnworth a1a2a804bf dep updates 2019-01-07 17:17:24 -08:00
gabrielburnworth 87323e56f9 upgrade joyride 2019-01-07 16:08:48 -08:00
gabrielburnworth 0e19100d74 lock dep versions 2019-01-07 16:06:55 -08:00
Rick Carlino 0c8c7a8d54
Merge pull request #1080 from RickCarlino/nightly
Merge `nightly` branch into `staging`.
2019-01-07 15:35:14 -06:00
Rick Carlino e0e2540bef Re-run migrations 2019-01-07 15:06:02 -06:00
Rick Carlino 14c64943a3 Merge branch 'master' of github.com:FarmBot/Farmbot-Web-App into nightly 2019-01-07 15:05:44 -06:00
Rick Carlino 4248c8fe4a Resolve conflicts in strucutre.sql 2019-01-07 15:04:42 -06:00
Rick Carlino dce91cdcc3
Merge pull request #1078 from FarmBot/staging
v7.1.1 - Happy Hibiscus
2019-01-07 14:49:17 -06:00
Rick Carlino 2633d1729a
Merge pull request #1077 from RickCarlino/recovery_deploy
Recovery Deploy
2019-01-07 11:03:36 -06:00
Rick Carlino 4a5550f85c Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into recovery_deploy 2019-01-07 10:40:09 -06:00
Rick Carlino b4a21a5393 Merge branch 'staging' into nightly 2019-01-06 13:28:13 -06:00
Rick Carlino 4e5348664d
Merge pull request #1075 from gabrielburnworth/staging
Minor bug fixes part 2
2019-01-05 10:53:33 -06:00
gabrielburnworth f2571ad3cb os update button fix part 2 2019-01-04 13:26:52 -08:00
Rick Carlino 2f6123d337
Merge pull request #1074 from gabrielburnworth/staging
Minor bug fixes
2019-01-04 14:27:25 -06:00