Commit Graph

9182 Commits (d99f5987843dbd9f1d70db1830b0fcf96ff2d2ae)

Author SHA1 Message Date
Rick Carlino d99f598784 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into fix_docker_compose 2019-11-25 13:23:13 -06:00
Rick Carlino 53d203372c
Merge pull request #1596 from PitouGames/staging
Translate french statements
2019-11-25 12:51:12 -06:00
Gabriel Burnworth 98a9eb539b
Update panel_header.tsx 2019-11-25 10:42:34 -08:00
Pitou 5c7bcac281 Translate french statements 2019-11-25 19:03:46 +01:00
Rick Carlino 69249dc471
Merge pull request #1590 from FarmBot/trim_logs
Clean up excess logs via sampling
2019-11-24 10:07:28 -06:00
Rick Carlino 21fe23b5a4
Merge branch 'staging' into trim_logs 2019-11-24 09:01:40 -06:00
Rick Carlino 1559ee0f0f Clean up excess logs via sampling 2019-11-24 08:58:38 -06:00
Rick Carlino 741e06a2cc
Merge pull request #1581 from gabrielburnworth/staging
Map action updates
2019-11-23 11:43:55 -06:00
Rick Carlino fa1ec452c0
Merge branch 'staging' into staging 2019-11-23 11:10:54 -06:00
Rick Carlino 026078a6d2
Merge pull request #1589 from FarmBot/verbiage
Verbiage Updates
2019-11-23 10:59:22 -06:00
Rick Carlino 71a5c5c122 Minor verbiage updates 2019-11-23 10:03:04 -06:00
gabrielburnworth 6305e41e8f fix group edit mode actions 2019-11-22 11:57:22 -08:00
Rick Carlino 18cb99f1f3 Verbiages updates, part I 2019-11-22 11:51:36 -06:00
Rick Carlino fd867fca70
Merge pull request #1579 from FarmBot/better_inactive
Remove deprecation warnings, rename api:deprecate to api:tidy
2019-11-22 08:26:02 -06:00
Rick Carlino 27c66e31fc
Merge branch 'staging' into better_inactive 2019-11-22 07:58:15 -06:00
Rick Carlino fee91ee2b2
Merge pull request #1580 from gabrielburnworth/staging
Map updates
2019-11-22 07:58:00 -06:00
gabrielburnworth 8422f446a9 add map scale transition 2019-11-21 14:32:05 -08:00
gabrielburnworth a821afd290 add restriction and new exit to plant edit mode 2019-11-21 14:30:42 -08:00
Rick Carlino 98c22d5835
Merge branch 'staging' into better_inactive 2019-11-21 14:16:03 -06:00
Rick Carlino 84a18ffde6 Remove deprecation warnings, rename api:deprecate to api:tidy 2019-11-21 13:57:19 -06:00
Rick Carlino 73276a323c
Merge pull request #1578 from FarmBot/better_inactive
Delete inactive accounts automatically.
2019-11-21 13:35:51 -06:00
Rick Carlino e8bf8e3587 Verbiage updates 2019-11-21 11:44:47 -06:00
Rick Carlino e70695536a Account deactivation ✔️ 2019-11-21 11:25:46 -06:00
Rick Carlino a0e69bdb4a Automatically delete old accounts after 14 days. TODO: Tests 2019-11-20 17:49:39 -06:00
Rick Carlino 8ac0c0625e
Merge pull request #1577 from gabrielburnworth/staging
Panel updates and fixes
2019-11-20 14:21:36 -06:00
gabrielburnworth 574be119b1 dep updates (fe) 2019-11-20 11:59:21 -08:00
gabrielburnworth a6b6b872f1 fix margin css 2019-11-20 11:51:32 -08:00
gabrielburnworth 290eb11441 fix auto-deprecator 2019-11-20 11:50:49 -08:00
gabrielburnworth aa6326c3b2 allow translation of new phrases 2019-11-20 11:50:15 -08:00
gabrielburnworth 0a4db75572 update point panels 2019-11-20 11:48:55 -08:00
gabrielburnworth 4eb8ac28a8 add new panel color 2019-11-20 11:48:14 -08:00
Rick Carlino b8929d6de5
Merge pull request #1576 from gabrielburnworth/staging
Change map zoom method
2019-11-19 13:35:05 -06:00
gabrielburnworth db135676dd dep updates (fe) 2019-11-19 10:49:01 -08:00
gabrielburnworth 27214fa0a4 clean up test output 2019-11-19 10:34:11 -08:00
gabrielburnworth 8f626c2833 remove css zoom usage 2019-11-19 10:22:52 -08:00
Rick Carlino b251dbdf8c
Merge pull request #1575 from FarmBot/grid_planting
Grid and Row Planting
2019-11-19 11:48:28 -06:00
Rick Carlino 839928a1fe Linter fixes 2019-11-19 11:24:09 -06:00
Rick Carlino 5ccdc30654 AddPlant no longer has a done button. Remove tests for said button. 2019-11-19 10:02:39 -06:00
Rick Carlino 19c7ef2f36 createCB tests 2019-11-19 09:31:04 -06:00
Rick Carlino 22f90b08fa <PlantGrid/> tests, part II 2019-11-19 08:58:22 -06:00
Rick Carlino 60fc32fd7e <PlantGrid/> tests, part I 2019-11-19 08:25:03 -06:00
Rick Carlino dbb330efcf stashGrid tests 2019-11-18 17:57:03 -06:00
Rick Carlino 354e51b265 saveGrid tests 2019-11-18 17:34:36 -06:00
Rick Carlino 085f165318 Merge branch 'grid_planting' of github.com:FarmBot/Farmbot-Web-App into grid_planting 2019-11-18 15:54:15 -06:00
Rick Carlino efb2eeab00 InputCell tests 2019-11-18 15:52:53 -06:00
Rick Carlino 9c0bbc3f81 Tests for generateGrid 2019-11-18 14:20:46 -06:00
Rick Carlino ad5b8cca37 mapStateToProps tests. 2019-11-18 13:38:23 -06:00
Rick Carlino 0c687233c7 Merge branch 'security_updates' into grid_planting 2019-11-18 04:40:41 -06:00
Rick Carlino 9dcdf1a000 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into security_updates 2019-11-18 04:37:52 -06:00
Rick Carlino 79085e32a0 Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into grid_planting 2019-11-18 04:37:38 -06:00