Commit Graph

8424 Commits (a01fb961d492d905979e2adec7c74eadd3377a54)

Author SHA1 Message Date
Rick Carlino a01fb961d4 Preboot removal, part III 2019-07-17 15:22:50 -05:00
Rick Carlino 8bc3849e6c
Merge pull request #1285 from gabrielburnworth/staging
Prevent saving of empty Farm Events
2019-07-17 15:20:33 -05:00
gabrielburnworth dcdc1ae79f prevent saving of empty farm events 2019-07-17 12:38:26 -07:00
Rick Carlino 992b6f9e1c
Merge pull request #1284 from RickCarlino/wednesday
Fix #1283
2019-07-17 11:28:23 -05:00
Rick Carlino 0284d90b33 Force refresh `updated_at` of FarmEvent,Regimen. Fixes #1283 2019-07-17 11:10:12 -05:00
Rick Carlino 01eac40dd6 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into staging 2019-07-17 10:38:47 -05:00
Rick Carlino 22aaac23a2
Merge pull request #1282 from gabrielburnworth/staging
Update FBOS details
2019-07-16 15:40:08 -05:00
Rick Carlino f4b90eaea5
Merge pull request #1281 from FarmBot/staging
v8.0.0
2019-07-16 15:38:24 -05:00
Rick Carlino 6d9f18b708
Merge branch 'master' into staging 2019-07-16 14:11:06 -05:00
gabrielburnworth 1fb8048ba4 update fbos details 2019-07-16 12:07:29 -07:00
Rick Carlino 522faac3f1
Merge pull request #1280 from RickCarlino/wednesday
Log sanitizer updates. Fixes #1279
2019-07-16 10:32:17 -05:00
Rick Carlino 2a8629d45b
Merge branch 'staging' into wednesday 2019-07-16 09:19:19 -05:00
Rick Carlino 3de2a3fdad
Merge pull request #1277 from gabrielburnworth/staging
Simplify board type dropdown component
2019-07-16 09:19:08 -05:00
Rick Carlino 5351f0c48f
Merge branch 'staging' into staging 2019-07-16 08:40:31 -05:00
Rick Carlino 67101f93b3
Merge branch 'staging' into wednesday 2019-07-16 08:39:56 -05:00
Rick Carlino 3f275a767d
Merge pull request #1278 from gabrielburnworth/toast_colors
Fix toast colors
2019-07-16 08:39:04 -05:00
Rick Carlino 43c4729441 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into wednesday 2019-07-16 08:37:23 -05:00
Rick Carlino 90b9fbd2d3 Downgrade exception to "return false;" in log sanitizer 2019-07-16 08:37:09 -05:00
Rick Carlino 45090a0575
Merge branch 'staging' into toast_colors 2019-07-16 08:03:17 -05:00
Rick Carlino 4128d99afc
Merge branch 'staging' into staging 2019-07-16 08:01:14 -05:00
Rick Carlino 59d7df8566
Merge pull request #1275 from RickCarlino/tuesday
Throttle MQTT emails to 1/day max. Closes #1273.
2019-07-16 08:01:02 -05:00
gabrielburnworth 7a7d24c17f fix toast colors 2019-07-15 17:37:27 -07:00
gabrielburnworth 676f83f05c simplify board type dropdown component 2019-07-15 16:22:37 -07:00
Rick Carlino 9fafc6ba6b
Merge branch 'staging' into tuesday 2019-07-15 17:23:12 -05:00
Rick Carlino e902f9bb9e Improve tests for Device.connection_warning 2019-07-15 17:20:07 -05:00
Rick Carlino 42430c569b
Merge pull request #1274 from RickCarlino/monday
FE-side `Alert` creation.
2019-07-15 17:10:02 -05:00
Rick Carlino 3252e8cc7e Don't send MQTT throttle emails more than once per day. 2019-07-15 17:08:51 -05:00
Rick Carlino 7dd178e2d8 FBJS upgrade 2019-07-15 16:41:46 -05:00
Rick Carlino ebaa3c675d Done. Closes #1272 2019-07-15 16:23:06 -05:00
Rick Carlino e2b5690471 Add tests 2019-07-15 16:15:53 -05:00
Rick Carlino 5477adca07 add `none` to the list of option on `firmware_missing` card. 2019-07-15 15:32:42 -05:00
Rick Carlino e0e1198a7e Done, needs tests 2019-07-15 15:22:41 -05:00
Rick Carlino 6fef439d20 [STABLE][TEST-ME] Draft I 2019-07-15 14:44:40 -05:00
Rick Carlino 51d8f0e0ca
Merge pull request #1271 from RickCarlino/monday
Parcel Updates
2019-07-14 20:23:47 -05:00
Rick Carlino a5955364dd Add @babel/core (parcel v7 stuff) 2019-07-14 18:53:22 -05:00
Rick Carlino 04daa7df00 Bundler upgrades 2019-07-14 18:23:03 -05:00
Rick Carlino 1421e10fba
Merge pull request #1270 from RickCarlino/fri
Updates to demo accounts, configs, docker
2019-07-14 17:16:21 -05:00
Rick Carlino a1192763b4 Merge branch 'remove_bot_alerts_from_fe' of github.com:RickCarlino/farmbot-web-app into fri 2019-07-14 17:01:20 -05:00
Rick Carlino 23119d4c12 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into fri 2019-07-13 13:10:24 -05:00
Rick Carlino ff957f9ecb
Merge pull request #1269 from gabrielburnworth/fix_apt_ci_issue
Fix apt ci issue
2019-07-13 12:54:33 -05:00
Gabriel Burnworth fde2f11a93
ensure specified version of node is installed 2019-07-12 18:09:11 -07:00
gabrielburnworth 8b2cef8727 fix apt ci issue 2019-07-12 16:57:12 -07:00
Rick Carlino 4397195e79 Merge branch 'remove_bot_alerts_from_fe' into fri 2019-07-12 16:23:50 -05:00
Rick Carlino c12c2214e2
Merge pull request #34 from gabrielburnworth/remove_bot_alerts_from_fe
remove bot alerts from FE
2019-07-12 15:55:14 -05:00
gabrielburnworth f746dc80eb post-FBJS update cleanup 2019-07-12 13:50:32 -07:00
gabrielburnworth 8e6fc08a10 remove bot alerts from FE 2019-07-12 13:39:40 -07:00
Rick Carlino 288456c416 Updates to demo seeder 2019-07-12 15:10:25 -05:00
Rick Carlino 83b7955e28 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into fri 2019-07-12 14:32:18 -05:00
Rick Carlino 2c8e177095 [UNSTABLE] Dep upgrades + interface updates 2019-07-12 14:30:10 -05:00
Rick Carlino 67e2937da8 Test deploy; please ignore. 2019-07-12 10:16:47 -05:00