Commit Graph

9416 Commits (2ad20ea54d9f7f24e894c730cc362ec5683f51d0)

Author SHA1 Message Date
gabrielburnworth 2ad20ea54d dep updates (fe) 2019-12-27 12:59:13 -08: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 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
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
Rick Carlino f803dfd6cf Boop 2019-12-19 20:24:20 -06:00
gabrielburnworth 4b12828262 minor folders ui fixes 2019-12-19 18:03:31 -08:00
Rick Carlino 209b355481 Dont preemptively saved unsaved sequences when moving between folders. CC: @gabreilBurnworth 2019-12-19 20:01:17 -06:00
Rick Carlino 114673d756 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into folders 2019-12-19 19:55:33 -06:00
Rick Carlino 4d92f37a98
Merge pull request #1635 from FarmBot/sensor_reading
Add `read_at` column to `sensor_readings` table.
2019-12-19 19:55:24 -06:00
Rick Carlino 34b3a69e9e Merge conflicts 2019-12-19 19:55:16 -06:00
Rick Carlino 077894bb4d Add `read_at` column to `sensor_readings` table. Closes #1363 2019-12-19 19:32:51 -06:00
gabrielburnworth a2ae2ea38e folder ui updates 2019-12-19 17:30:02 -08:00
Rick Carlino d2549c0208
Merge pull request #1633 from FarmBot/force_reset
Add `needs_reset` column to `devices` table.
2019-12-19 16:15:48 -06:00
Rick Carlino 8e43cb894c Add `needs_reset` column to `devices` table 2019-12-19 15:41:03 -06:00
Rick Carlino 2099d7acbb Merge branch 'master' of github.com:FarmBot/Farmbot-Web-App into staging 2019-12-19 15:26:54 -06:00
Rick Carlino f9ac3e659f Fix the folder color picker 2019-12-19 10:26:40 -06:00
Rick Carlino e02673aa79 Make icons easier to click. NEXT: Fix edit state rendering issues 2019-12-18 18:47:51 -06:00
Rick Carlino 08e15087cd Change saucer for sequence in item UI 2019-12-18 18:31:52 -06:00
Rick Carlino 1607449bb7 Add saucer to sequence item UI 2019-12-18 18:28:24 -06:00
Rick Carlino 1d7534adae Improve the "click to move" functionality 2019-12-18 18:14:56 -06:00
Rick Carlino 205121da43 Even more cleanup. TODO: Cleanup sequence move UI 2019-12-18 18:04:07 -06:00
Rick Carlino 129309e910 Rename some classes, pull move arrow to the right 2019-12-18 17:55:01 -06:00
Rick Carlino 3cd5754b63 Remove extra padding on folder items 2019-12-18 17:42:16 -06:00
Rick Carlino 2db87096a3 Hmm 2019-12-18 17:35:58 -06:00
Rick Carlino 0c9a04c6d8 Smoosh folder items, too 2019-12-18 17:22:55 -06:00
Rick Carlino f31c38158f Smoosh folders closer together 2019-12-18 17:12:12 -06:00
Rick Carlino 8d91e18650 Float stuff correctly 2019-12-18 17:02:50 -06:00
Rick Carlino b0718c2e9a Hmm... CC: @gabrielBurnworth 2019-12-18 16:46:38 -06:00
Rick Carlino ed0661917e Merge branch 'folders' of https://github.com/gabrielburnworth/Farmbot-Web-App into folders 2019-12-18 16:09:18 -06:00
gabrielburnworth 74b0373c51 add empty state wrapper back 2019-12-18 13:23:37 -08:00