Commit Graph

9645 Commits (d931cd1b84735c35db0bcd206547693ce1bf5194)

Author SHA1 Message Date
Rick Carlino d306b65909 Use radio buttons for pin selection (instead of input text boxes) 2020-01-02 12:20:29 -06:00
Rick Carlino 19798b894f
Merge pull request #1648 from FarmBot/new_steps
Part I of New Sequence Steps
2020-01-02 11:40:15 -06:00
Rick Carlino b7c618aec8 More tests for `reboot` RPC in sequence editor 2020-01-02 11:10:54 -06:00
Rick Carlino 44c1e0b964 Fix test failure 2020-01-02 09:11:11 -06:00
Rick Carlino 47a2e5b1e3 Merge branch 'staging' into new_steps 2019-12-30 16:52:30 -06:00
Rick Carlino 6aff7445f1 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into new_steps 2019-12-30 16:52:24 -06:00
Rick Carlino 51f061a325 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into staging 2019-12-30 16:52:10 -06:00
Rick Carlino 1f6a71e6af
Merge pull request #1647 from gabrielburnworth/staging
Bulk plant status update
2019-12-30 16:50:56 -06:00
gabrielburnworth aed825a7ad fix text display bug 2019-12-30 12:16:36 -08:00
gabrielburnworth afd35f7291 add webcam tests 2019-12-30 12:16:07 -08:00
gabrielburnworth b8707f90cb peripherals column refactor 2019-12-30 12:15:39 -08:00
gabrielburnworth 31127c4edd update tool slot position string 2019-12-30 12:14:15 -08:00
gabrielburnworth 53b09e70a4 bulk plant status update 2019-12-30 12:13:23 -08:00
Rick Carlino d854cb9b22
Merge pull request #1645 from FarmBot/log_fbos_version
Add FBOS version to debug logs
2019-12-30 14:08:54 -06:00
gabrielburnworth f83a345227 add fbos version to debug log 2019-12-30 10:21:28 -08:00
Rick Carlino f2ca8fc6fa Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into new_steps 2019-12-30 12:10:53 -06:00
Rick Carlino 4ea82828d4 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into staging 2019-12-30 11:53:33 -06:00
Rick Carlino 3677fb8a37
Merge pull request #1644 from gabrielburnworth/staging
Tools panel updates
2019-12-30 11:52:43 -06:00
gabrielburnworth 1063b38626 left panel css fixes 2019-12-30 08:09:34 -08:00
gabrielburnworth ebe8831900 tools panel updates 2019-12-30 08:08:48 -08:00
Rick Carlino c3f5423823
Merge pull request #1643 from gabrielburnworth/staging
Add new board type
2019-12-30 08:17:31 -06:00
gabrielburnworth 2ad20ea54d dep updates (fe) 2019-12-27 12:59:13 -08:00
Rick Carlino 56002e5555 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into staging 2019-12-27 14:58:49 -06:00
gabrielburnworth 6bc6e6ffec add new board type 2019-12-27 12:30:58 -08:00
Rick Carlino ea8428621a
Merge pull request #1642 from gabrielburnworth/staging
Add camera type
2019-12-27 14:16:23 -06:00
gabrielburnworth 1455bebba2 minor folder edit fixes 2019-12-27 10:38:29 -08:00
gabrielburnworth 22465a5558 add none camera type 2019-12-27 10:37:54 -08:00
Rick Carlino 4fa48cb74b
Merge pull request #1641 from gabrielburnworth/staging
Improve error recovery
2019-12-27 12:26:09 -06:00
gabrielburnworth c2d80bd55c increase error containment 2019-12-26 12:20:10 -08:00
Rick Carlino fea40c1d9a Merge branch 'master' of github.com:FarmBot/Farmbot-Web-App 2019-12-26 10:49:57 -06:00
Rick Carlino a810743fa7
Merge pull request #1640 from FarmBot/staging
v9.0.2 - Jolly Juniper
2019-12-26 10:48:09 -06:00
Rick Carlino 79690a90a2 WIP 2019-12-26 10:25:03 -06:00
Rick Carlino 5e52d3c6dd
Merge pull request #1639 from FarmBot/folders_feature
"Folders" Feature (Sequences Only)
2019-12-26 10:12:21 -06:00
Gabriel Burnworth 4dd1c04ae8
minor css fix 2019-12-24 11:38:45 -08:00
gabrielburnworth 071ffe39b5 add sequence update test 2019-12-23 16:01:00 -08:00
gabrielburnworth 9c3340be56 folders ui tests 2019-12-23 14:38:48 -08:00
Rick Carlino cd20fcf943 Add estop, servo_angle, toggle_pin steps. 2019-12-21 22:43:41 -06:00
gabrielburnworth 8d5218f67c folders ui updates 2019-12-21 11:47:19 -08:00
gabrielburnworth 307105c96e Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into folders 2019-12-21 11:46:16 -08:00
Rick Carlino f5554a4e00
Merge pull request #1638 from gabrielburnworth/staging
Add pin bindings to usage index
2019-12-20 18:48:35 -06:00
Rick Carlino f5be061c4d Merge branch 'folders' of https://github.com/gabrielburnworth/Farmbot-Web-App into folders 2019-12-20 18:09:39 -06:00
gabrielburnworth 6a8bd52902 add pin bindings to usage index 2019-12-20 15:48:56 -08:00
Rick Carlino a0abdcb198 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into folders 2019-12-20 17:46:23 -06:00
Rick Carlino ac5cc41b95
Merge pull request #1636 from FabioDessi/issue-1582
Farm designer grid line improvements #1582
2019-12-20 16:51:33 -06:00
Rick Carlino ee20868cb4
Merge branch 'staging' into issue-1582 2019-12-20 11:28:28 -06:00
Rick Carlino 545c7ca4c1
Merge pull request #1637 from FarmBot/fix_ci
Fix CI, upgrade deps.
2019-12-20 11:28:13 -06:00
Rick Carlino 9646426964 Dep upgrades 2019-12-20 11:01:32 -06:00
gabrielburnworth fa7fc0024e folders ui bug fix and test prep 2019-12-20 08:59:46 -08:00
Rick Carlino 434d6e5d79 Fix CI 2019-12-20 10:56:29 -06:00
Fabio Dessi 98a0abd7fa Merge branch 'staging' into issue-1582 2019-12-20 16:17:49 +01:00