Commit graph

6725 commits

Author SHA1 Message Date
Rick Carlino 1a35dfb136
Merge pull request #988 from FarmBot/staging
v6.6.2
2018-09-18 07:23:55 -05:00
Rick Carlino 356c303714
Merge branch 'master' into staging 2018-09-17 15:42:58 -05:00
Rick Carlino 76606073b1
Merge pull request #987 from gabrielburnworth/staging
Misc
2018-09-14 15:46:10 -05:00
gabrielburnworth 3b2e5ff26e fix controls page widget buttons 2018-09-14 13:02:29 -07:00
gabrielburnworth 3e1f11484b fix heading issues 2018-09-14 12:02:10 -07:00
gabrielburnworth 2ea0fc2e30 updates to constants 2018-09-14 11:32:31 -07:00
Rick Carlino aff5d24e32
Merge pull request #986 from gabrielburnworth/saved_gardens_updates
Saved gardens updates
2018-09-14 10:28:12 -05:00
gabrielburnworth caa1fdada0 saved gardens updates 2018-09-13 15:00:14 -07:00
Rick Carlino ccdbd94507
Merge pull request #985 from gabrielburnworth/sass_lint
Add sass linter
2018-09-13 16:37:28 -05:00
gabrielburnworth a70e60c6b7 add sass-lint 2018-09-13 13:30:57 -07:00
Rick Carlino f11ff0c29d
Merge pull request #984 from RickCarlino/thursday
Fix: Typo in consistency tracker
2018-09-13 10:56:54 -05:00
Rick Carlino 3a1ee3e837 Deploying to staging for QA 2018-09-13 09:29:46 -05:00
Rick Carlino 78bb58dbbd Remove unneeded test 2018-09-13 09:27:56 -05:00
Rick Carlino 61499dc78b Fix 2018-09-13 09:26:48 -05:00
Rick Carlino 1e892b091c Opps type error 2018-09-13 09:05:18 -05:00
Rick Carlino 260767bace Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into thursday 2018-09-13 08:56:20 -05:00
Rick Carlino 1fe5c3e933 Test deploy - roll this back plz 2018-09-13 08:54:35 -05:00
Rick Carlino 55da62ec72
Merge pull request #983 from gabrielburnworth/fbos_details_updates
FbosDetails updates
2018-09-13 07:59:07 -05:00
gabrielburnworth 3072db510c fbos_details updates 2018-09-12 18:31:41 -07:00
Gabriel Burnworth 7418ab82a3
Merge pull request #982 from RickCarlino/fbjs_updates
Upgrade FBJS
2018-09-12 17:58:02 -07:00
Rick Carlino f52e60c2ff Remove some any types and upgrade FBJS 2018-09-12 17:49:22 -05:00
Rick Carlino 3af772910a
Merge pull request #981 from RickCarlino/short_revision_fix
Bug fix when bootstrapping GlobalConfig
2018-09-12 17:44:12 -05:00
Rick Carlino bf508e33dd Possible fix for SHORT_REVISION issues? 2018-09-12 17:03:11 -05:00
Rick Carlino 041ee3ec11
Merge pull request #979 from RickCarlino/mark_as_x
First Draft: "Mark As..." Step
2018-09-12 16:23:29 -05:00
Rick Carlino be91a8a055 Merge branch 'mark_as_x' of https://github.com/rickcarlino/Farmbot-Web-App into mark_as_x 2018-09-12 16:10:43 -05:00
Rick Carlino 71cc3bc4ff Whoops add unpackUUID() helper 2018-09-12 16:09:40 -05:00
Rick Carlino 726bc5636f
Merge branch 'staging' into mark_as_x 2018-09-12 15:14:56 -05:00
Rick Carlino 5546dce6d4 Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into mark_as_x 2018-09-12 15:03:24 -05:00
Rick Carlino c24d88e63c resource_type tests 2018-09-12 15:01:34 -05:00
Rick Carlino 656acb55fd Fix blinky test 2018-09-12 14:54:10 -05:00
Rick Carlino 7d7e884d66 Fix resource_update test, but now other tests are blinking... 2018-09-12 14:40:14 -05:00
Rick Carlino ac6e5387b3 Fix blinky test 2018-09-12 13:25:35 -05:00
Rick Carlino f2c7249f39
Merge pull request #980 from FarmBot/fbos-commit-link
Add link to OS Firmware commit.
2018-09-12 12:07:56 -05:00
Rick Carlino 026eca4a4d Increase coverage of Sequences::Update 2018-09-12 11:23:22 -05:00
Connor Rigby f96801a9d0
Add link to OS Firmware commit. 2018-09-11 21:35:46 -07:00
gabrielburnworth b951fe7e79 mark as step updates 2018-09-11 16:17:30 -07:00
Rick Carlino db27fe5c52 Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into mark_as_x 2018-09-11 16:57:45 -05:00
Rick Carlino a1efb4e6de Add doc comments 2018-09-11 16:53:27 -05:00
Rick Carlino 63d665a82d Done with tests. Now docs / cleanup 2018-09-11 15:52:48 -05:00
Rick Carlino 9d8e80a647 More tests for commitSelection() 2018-09-11 15:35:02 -05:00
Rick Carlino b35d73241a Move more logic out of UI component 2018-09-11 14:41:04 -05:00
Rick Carlino 2eb6a88452 Start tests for UI component 2018-09-11 14:17:01 -05:00
Rick Carlino 056171f6a6 Update action_list tests 2018-09-11 13:59:47 -05:00
Rick Carlino 086d99c0aa Fix inconsistent caps 2018-09-11 13:50:06 -05:00
Rick Carlino db9860b13b Fix point vs plant issue. Not fixed: capitalization 2018-09-11 13:11:57 -05:00
Rick Carlino dc5093d134
Merge pull request #978 from gabrielburnworth/os_update_button
Minor fixes and additions
2018-09-11 12:43:35 -05:00
Rick Carlino c9b76711df Type error, TODO: Get tool_slots out of resource list. 2018-09-11 09:16:39 -05:00
Rick Carlino 9997a98c97 Finish action_list.ts tests 2018-09-11 08:18:18 -05:00
Rick Carlino 7c8b2f6157 Tests for device actions 2018-09-10 17:38:58 -05:00
gabrielburnworth 438f2fd90e OS info bug fix 2018-09-10 15:27:41 -07:00