Commit Graph

5125 Commits (2676171cb6627d9279a8a51119a41137c6a85786)

Author SHA1 Message Date
Rick Carlino 2676171cb6 Exclude db/ folder from code quality metrics 2018-03-07 09:14:20 -06:00
Rick Carlino e91c982287 Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into staging 2018-03-07 09:03:08 -06:00
Rick Carlino 2a4da7ee53
Merge pull request #699 from RickCarlino/reverify_bugs
Bug Fixes
2018-03-07 08:31:56 -06:00
Rick Carlino 24a0f7d211 Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into staging 2018-03-06 09:41:48 -06:00
Rick Carlino 6b53a343cc IDEA: Strip port from confirmation URLs 2018-03-06 09:17:31 -06:00
Rick Carlino 9f4a682cde Merge branch 'reverify_bugs' of https://github.com/rickcarlino/Farmbot-Web-App into reverify_bugs 2018-03-06 08:53:05 -06:00
Rick Carlino 06d20211ff Bug where tests fail on Travis 2018-03-06 08:51:29 -06:00
Rick Carlino 51aa5d1852
Merge branch 'staging' into reverify_bugs 2018-03-06 08:31:29 -06:00
Rick Carlino d252eb45f7 Add better verbiage to reverification error message 2018-03-06 08:23:39 -06:00
Rick Carlino 07c84ce36f Fix bug in re-verification 2018-03-06 08:17:12 -06:00
Rick Carlino a0fab7b45c
Merge pull request #698 from RickCarlino/router_bugs
Router Fixes
2018-03-05 16:29:41 -06:00
Rick Carlino 51141f97af Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into router_bugs 2018-03-05 16:19:07 -06:00
Rick Carlino e8e4760770
Merge branch 'staging' into router_bugs 2018-03-05 16:19:03 -06:00
Rick Carlino 3d7cb453a7 Cleanup page() helper 2018-03-05 16:17:25 -06:00
Rick Carlino 4d622be51f Cleanup page() helper 2018-03-05 16:14:35 -06:00
Rick Carlino c58f7170a2 Fixed..? 2018-03-05 15:37:49 -06:00
Rick Carlino c22b3f848d Restore route order 2018-03-05 15:36:06 -06:00
Rick Carlino f255d0065c Add type annotations to routes 2018-03-05 14:13:03 -06:00
Rick Carlino 0681a1b2d3
Merge pull request #697 from RickCarlino/plant_stages
Add `plant_stage` to Plant table
2018-03-05 13:39:48 -06:00
Rick Carlino 5f241d2455
Merge branch 'staging' into plant_stages 2018-03-05 11:32:33 -06:00
Rick Carlino f8fa19d077
Merge pull request #696 from RickCarlino/better_weed_deletion_msg
Improve error message when deleting weeds
2018-03-05 11:32:21 -06:00
Rick Carlino 7b4a4bb32c ✔️ Add plant stages 2018-03-05 11:28:55 -06:00
Rick Carlino b259970e98 Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into plant_stages 2018-03-05 11:16:04 -06:00
Rick Carlino 661430298c Plant#plant_stage 2018-03-05 11:15:56 -06:00
Rick Carlino 74294acdb8
Merge branch 'staging' into better_weed_deletion_msg 2018-03-05 09:59:32 -06:00
Rick Carlino 089a8770dc Add better error message 2018-03-05 09:54:16 -06:00
Rick Carlino 0b7ec89e84
Merge pull request #695 from RickCarlino/tests_for_route_config
Tests for route config
2018-03-05 08:01:59 -06:00
Rick Carlino 8fdf612f81 Remove unused variable 2018-03-05 07:41:14 -06:00
Rick Carlino 23c15f203f Merge branch 'staging' of https://github.com/DDDIM/Farmbot-Web-App into tests_for_route_config 2018-03-05 07:19:13 -06:00
Rick Carlino 34e69b374e
Merge branch 'staging' into staging 2018-03-05 07:18:46 -06:00
Rick Carlino 291c62f836
Merge pull request #691 from RickCarlino/tos_redirect
Fixes for TOS redirect and PW reset
2018-03-05 07:16:52 -06:00
Rick Carlino 81636758c7 Tests for maybeReplaceDesignerModules 2018-03-04 16:56:10 -06:00
Rick Carlino f6a8fffb82 ✔️ 2018-03-04 16:40:26 -06:00
DDDIM 1a20021d6f 1 2018-03-04 21:07:50 +03:00
Rick Carlino 9e73fcecb8 Add tests for route_config, but needs more assertions. 2018-03-04 11:06:16 -06:00
Rick Carlino ca5a0c6b82 route_config_test.ts 2018-03-04 10:17:24 -06:00
Rick Carlino 2ef4f54699 WIP 2018-03-02 15:07:13 -06:00
Rick Carlino b4f09cfcbd Even more de-duplication in route_config.ts 2018-03-02 14:52:23 -06:00
Rick Carlino 8a7ab642b9 [STABLE] Fix hardcoded error 2018-03-02 13:42:45 -06:00
Rick Carlino a4970e5c58 [UNSTABLE] Reduce duplication in selectors.tsx 2018-03-02 13:36:28 -06:00
Rick Carlino 115049a99c selector_support.ts 2018-03-02 12:45:31 -06:00
Rick Carlino c8f3ea52d8 ✔️ 2018-03-02 12:39:31 -06:00
Rick Carlino 7ae5c5eec0 ✔️ 2018-03-02 11:32:09 -06:00
Rick Carlino d8436b1960 Factor down motors.tsx 2018-03-02 11:25:51 -06:00
Rick Carlino ef901426c7 Steps_per_me_settings.tsx 2018-03-02 11:20:35 -06:00
Rick Carlino 4ff67932ab Factor down duplication 2018-03-02 11:16:39 -06:00
Rick Carlino fcc7f214eb Factor down duplication 2018-03-02 11:15:45 -06:00
Rick Carlino e21ee8bac8 Unstable idea 2018-03-02 09:53:57 -06:00
Rick Carlino 7903e502b5 Cleanup part IV 2018-03-02 09:25:15 -06:00
Rick Carlino d6e2758406 Cleanup part III 2018-03-02 09:12:47 -06:00