Commit graph

4900 commits

Author SHA1 Message Date
gabrielburnworth 4cdac3978d controls pop-up take photo button 2018-02-14 17:19:58 -08:00
gabrielburnworth 7abc517e96 fix read peripheral style issues 2018-02-14 16:15:52 -08:00
Rick Carlino a59f6be949
Merge pull request #660 from RickCarlino/read_pin_from_peripheral
Ability to use `Peripheral` resource in a sequence
2018-02-13 14:15:42 -06:00
Rick Carlino ea0ed48275
Merge branch 'staging' into read_pin_from_peripheral 2018-02-13 13:57:06 -06:00
Rick Carlino aa0d401128 Last set of ruby tests 2018-02-13 13:49:53 -06:00
Rick Carlino 979400072e Coverage updates 2018-02-13 13:24:13 -06:00
Rick Carlino 021fd9353b Make read_peripheral look like a `read_pinUSE EXISTING PERIPHERAL INSTEAD
`
2018-02-13 13:12:09 -06:00
Rick Carlino 8c7164bc2b Remove references to mode, plus subtle bug 2018-02-13 13:05:20 -06:00
Rick Carlino fee38ff66c FBJS update 2018-02-13 12:42:44 -06:00
Rick Carlino a89b8fa87e Update read_peripheral block; Remove mode column. 2018-02-13 12:16:10 -06:00
Rick Carlino 2cf8ad2791
Merge pull request #661 from RickCarlino/firmware_config_handler
Fix: "No handler written for this one yet."
2018-02-13 11:39:50 -06:00
Rick Carlino 1cb332f441 Fix: No handler written for this one yet. 2018-02-13 10:52:52 -06:00
Rick Carlino 74a3246bd8 Merge branch 'read_pin_from_peripheral' of https://github.com/rickcarlino/Farmbot-Web-App into read_pin_from_peripheral 2018-02-13 10:40:08 -06:00
Rick Carlino 73e6377598 Unused imports 2018-02-13 10:39:38 -06:00
Rick Carlino b553adae5e Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into read_pin_from_peripheral 2018-02-13 10:31:19 -06:00
Rick Carlino c6b3e5d800
Merge branch 'staging' into read_pin_from_peripheral 2018-02-13 10:29:16 -06:00
Rick Carlino c61db600ad Tests for read_peripheral step tile 2018-02-13 10:21:11 -06:00
Rick Carlino 9e58be20ce Fix tests part I 2018-02-13 08:46:20 -06:00
Rick Carlino b5d32c9e74 Debugging mock issues 2018-02-13 08:35:05 -06:00
Rick Carlino 704f14fc7f Add CSS rule for links in .step-wrapper 2018-02-13 08:20:08 -06:00
Rick Carlino fdd41c5820
Merge pull request #658 from RickCarlino/staging
Allow `name` in `images.meta`
2018-02-13 08:15:26 -06:00
Rick Carlino a106faf7a3
Merge branch 'staging' into staging 2018-02-13 08:03:56 -06:00
Rick Carlino d8dc909684
Merge pull request #659 from gabrielburnworth/master
Map Photo updates
2018-02-13 08:03:33 -06:00
Rick Carlino 74ea34e698 Update tests for Peripheral#destroy 2018-02-13 07:47:04 -06:00
gabrielburnworth 7300150ff4 map image updates 2018-02-12 23:20:38 -08:00
gabrielburnworth 332d7748b7 map grid updates 2018-02-12 23:20:00 -08:00
Rick Carlino f4c9537b98 [FIRST DRAFT][WORKS][NEEDS CLEANUP] read_peripheral block 2018-02-12 16:58:41 -06:00
Rick Carlino c237eba106 Allow name in images.meta 2018-02-12 16:15:00 -06:00
Rick Carlino b1600918be WIP 2018-02-12 16:13:17 -06:00
Rick Carlino 504a083077 WIP 2018-02-12 14:34:32 -06:00
Rick Carlino 1d23a52d4e Begin <PeripheralSelection/> 2018-02-12 11:45:02 -06:00
Rick Carlino e8cacd810f FBJS update 2018-02-12 11:25:01 -06:00
Rick Carlino cb1e91a89c (API Only) Allow peripherals for read_pin, disallow deletion of peripherals in use 2018-02-12 10:38:19 -06:00
Rick Carlino 78cdd28fe2
Merge pull request #657 from RickCarlino/no_seq_deps
Remove SequenceDependency Model
2018-02-12 09:02:41 -06:00
Rick Carlino eb23987c38 ✔️ Remove SequenceDependency table from application 2018-02-12 08:47:46 -06:00
Rick Carlino b518f4588d Semantic error in Points::Delete. 2018-02-12 08:28:31 -06:00
Rick Carlino 0175ea2e90 Fix ./spec/mutations/points/destroy_spec.rb:5 2018-02-12 08:21:36 -06:00
Rick Carlino 2a4e671251 Update FactoryBot after(:build) hook (now it stores EdgeNodes and whatnot) 2018-02-12 07:39:48 -06:00
Rick Carlino 01b994c753 Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into no_seq_deps 2018-02-12 07:14:57 -06:00
Rick Carlino a9f8dc72dd
Merge pull request #656 from gabrielburnworth/map_image
Farm Designer Images
2018-02-12 07:11:04 -06:00
gabrielburnworth 2555d06992 move gridlines above images 2018-02-11 19:03:54 -08:00
gabrielburnworth 47859b1279 render multiple map images 2018-02-11 19:03:40 -08:00
gabrielburnworth 532aa38a59 add photos map legend toggle 2018-02-11 18:52:21 -08:00
gabrielburnworth 482848c7ec place latest image in map 2018-02-11 18:51:49 -08:00
Rick Carlino e1e192ed10 Last fix: Points::Destroy#all_deps 2018-02-11 16:09:18 -06:00
Rick Carlino 24b73bf8e6 Fix spec/controllers/api/sequences/sequences_destroy_spec.rb 2018-02-11 15:55:53 -06:00
Rick Carlino e300fb38a1 Fix spec/controllers/api/sequences/sequences_create_spec.rb 2018-02-11 15:48:18 -06:00
Rick Carlino a7d329d6d6 Fix failures in spec/controllers/api/tools/destroy_spec.rb 2018-02-11 15:40:21 -06:00
Rick Carlino d691119542 Fix failures in spec/mutations/sequences/delete_spec.rb 2018-02-11 14:48:11 -06:00
Rick Carlino a079c5c5a4 Fix failures in api/points/update_spec.rb 2018-02-11 14:32:32 -06:00