Commit Graph

9232 Commits (8dc809380e81af330e60ab4faf5f543f2159e0b1)

Author SHA1 Message Date
Rick Carlino e711183cf0
Merge branch 'staging' into grid_planting 2019-11-16 09:38:00 -06:00
Rick Carlino e249949738 Security updates 2019-11-16 09:32:48 -06:00
Rick Carlino 7b8cfe9f4b overflowX: none 2019-11-15 16:43:25 -06:00
Rick Carlino 8127f5e529 overflowY: scroll 2019-11-15 16:32:08 -06:00
Rick Carlino 80f20cf7f4 Add styles to horizontal rule 2019-11-15 16:23:30 -06:00
Rick Carlino 0518f7e40e Use `name` as `plant.name` instead of `openfarm_slug` 2019-11-15 16:20:06 -06:00
Rick Carlino be854a047b Allow scrolling of grid planting panel 2019-11-15 16:07:04 -06:00
Rick Carlino 652b5e1358 openfarm_slug the variable, not the string 2019-11-15 15:59:52 -06:00
Rick Carlino f86182f46a Confirm save on exit via back button 2019-11-15 15:55:22 -06:00
Rick Carlino 8a903b7463 Swap numPlantsV and spacingH 2019-11-15 15:16:15 -06:00
Rick Carlino 9c83b01e4a Swap numPlantsV and spacingH 2019-11-15 15:14:46 -06:00
Rick Carlino 97bad3c217 Remove DONE button 2019-11-15 14:58:44 -06:00
Rick Carlino 232dccaf5d Grid icons match users xy_swap setting 2019-11-15 13:36:59 -06:00
Rick Carlino 1d14585ccb Dont clear form values when user clicks "CANCEL" 2019-11-15 12:41:10 -06:00
Rick Carlino 5b809926ad Swap the position of the SAVE and CLEAR buttons. Change CLEAR to CANCEL. 2019-11-15 12:34:48 -06:00
Rick Carlino 7f00a1fe6e Add "Grid and Row" header 2019-11-15 11:53:10 -06:00
Rick Carlino 313b129e7f Style the button. NEXT: Test and ship 2019-11-15 10:51:23 -06:00
Rick Carlino 0a2c9a7b74 Input boxes are ✔️. NEXT: Buttons, tests. 2019-11-15 10:39:22 -06:00
Rick Carlino 8661241fd8 Extract grid inputs to <GridInput/> 2019-11-15 08:30:13 -06:00
Rick Carlino 47942fb9c8 Limit grids to 100 for now. 2019-11-15 07:45:22 -06:00
Rick Carlino 55ed669de7 preview and clear works (grid planting) 2019-11-14 15:36:04 -06:00
Rick Carlino 0240da91db It initializes a grid. NEXT: Save the plant to API 2019-11-14 11:49:30 -06:00
Rick Carlino 784ddda2aa initPlantGrid() is ready for use. 2019-11-14 10:32:28 -06:00
Rick Carlino 84d32ae347
Merge pull request #1574 from FarmBot/master
Master -> Staging
2019-11-14 10:00:01 -06:00
Rick Carlino d979ee6381 Implementation and tests for vectorGrid() helper. 2019-11-14 09:59:25 -06:00
Rick Carlino 1cf8a3c76d Merge branch 'master' of github.com:FarmBot/Farmbot-Web-App into grid_planting 2019-11-14 08:09:50 -06:00
Rick Carlino b8867cc165
Merge pull request #1573 from FarmBot/thursday_deploy
v8.2.0 - Iridescent Iris
2019-11-14 08:06:21 -06:00
Rick Carlino 2f4f470499 Merge branch 'staging' into grid_planting 2019-11-14 08:01:04 -06:00
Rick Carlino 0e2c016ef4 Feature flag for ota_update_hour 2019-11-13 16:49:39 -06:00
Rick Carlino e1780991d4 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into thursday_deploy 2019-11-13 15:55:21 -06:00
Rick Carlino 12b6d1918d Stub out Preview/Save/Clear buttons 2019-11-13 15:39:32 -06:00
Rick Carlino 5f90caa19a Add `dispatch` to props. Change "apply" to "preview" 2019-11-13 14:59:56 -06:00
Rick Carlino ea0aebcdc9 Stub out HTML form controls. TODO: Add `dirty` flag, undo button 2019-11-13 14:18:17 -06:00
Rick Carlino f4bd323db9 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into grid_planting 2019-11-13 10:52:46 -06:00
Rick Carlino 1f9caf057d
Merge pull request #1570 from FarmBot/ota_hour_part_iii
Honor user time format settings for OTA update time
2019-11-13 10:38:57 -06:00
Rick Carlino dd077d0cf7 Tests for Util.scrollToBottom 2019-11-13 10:14:52 -06:00
Rick Carlino b6d3852a0f Show "immediate" first in dropdown 2019-11-13 09:56:32 -06:00
Rick Carlino da8cf5ea0d Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into staging 2019-11-12 15:32:41 -06:00
Rick Carlino f04da2a91c Tests for assertIsHour() 2019-11-12 14:53:47 -06:00
Rick Carlino b6c4f296cc Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into ota_hour_part_iii 2019-11-12 14:02:14 -06:00
Rick Carlino 5c9d312ea2
Merge pull request #1569 from PitouGames/master
Fix some french translations
2019-11-12 14:01:50 -06:00
Rick Carlino a5cbb3f0fc ✔️ Honor user time format settings when selecting OTA Hour. Needs tests. 2019-11-12 13:58:46 -06:00
Rick Carlino e0bfcb4b42 [UNSTABLE/WIP] Want to upgrade to TSC 3.7 so I can use type assertions 2019-11-12 12:56:42 -06:00
Rick Carlino 50829d9b02 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into staging 2019-11-12 12:22:54 -06:00
Pitou 87f59f5075 Fix login page french translation 2019-11-12 16:13:43 +01:00
Pitou ac1f28c2cb Fix some french translations 2019-11-12 16:13:43 +01:00
Rick Carlino ea64565c21
Merge pull request #1566 from FarmBot/mqtt_hotfix
Better MQTT error messages for end users.
2019-11-11 15:18:17 -06:00
Rick Carlino 1aaff4c40d
Merge branch 'staging' into mqtt_hotfix 2019-11-11 13:42:59 -06:00
Rick Carlino 774732d37f
Merge pull request #1567 from FarmBot/ota_hour_part_ii
OTA hour selector updates, part I
2019-11-11 10:36:53 -06:00
Rick Carlino 6bc9ca53ff Merge branch 'master' of https://git.heroku.com/farmbot-production into staging 2019-11-11 09:53:35 -06:00