Commit Graph

9232 Commits (8dc809380e81af330e60ab4faf5f543f2159e0b1)

Author SHA1 Message Date
Fabio Dessi 8dc809380e added .idea folder to .gitignore 2019-12-16 15:35:01 +01:00
Rick Carlino 0ef7833d81
Merge pull request #1624 from PitouGames/staging
French translations
2019-12-13 13:20:45 -06:00
Rick Carlino d2a9130cfb
Merge branch 'staging' into staging 2019-12-12 15:15:58 -06:00
Rick Carlino 5cef28bf15
Merge pull request #1625 from FarmBot/coverage_task
Update coverage task
2019-12-12 15:15:37 -06:00
gabrielburnworth cef9a3e6f3 update coverage task 2019-12-12 11:51:19 -08:00
Pitou f88f3fd858 Give more space to descriptions 2019-12-12 16:22:46 +01:00
Pitou dabd8032a1 Fix and add french translations 2019-12-12 16:11:42 +01:00
Pitou fbcbf3bf92 Fix and add french tranlations 2019-12-12 14:59:02 +01:00
Rick Carlino 3904c7d1f8
Merge pull request #1623 from FarmBot/ci-fix
Update CI config
2019-12-11 14:31:23 -06:00
Gabriel Burnworth 0614e81ed4
hopefully improve ci reliability 2019-12-11 09:55:15 -08:00
Rick Carlino 85b3b0051c
Merge pull request #1622 from gabrielburnworth/staging
Map action updates
2019-12-10 14:48:26 -06:00
gabrielburnworth 0625a20853 minor css fix 2019-12-10 12:10:22 -08:00
gabrielburnworth c08b9f4682 reorganize point panels folder 2019-12-10 12:09:52 -08:00
gabrielburnworth 240f86c7c1 update map actions 2019-12-10 12:08:54 -08:00
Rick Carlino bb9566345a
Merge pull request #1621 from FarmBot/master
Master => Staging
2019-12-10 14:06:15 -06:00
Rick Carlino 13f020901a
Merge pull request #1620 from FarmBot/recovery_deploy
Recovery deploy
2019-12-09 19:04:53 -06:00
Rick Carlino 947d205c09 Be less noisy when cancelling account deletion 2019-12-09 18:24:22 -06:00
Rick Carlino b3eb1fff13
Merge pull request #1616 from FarmBot/staging
v8.2.4 - Iridescent Iris
2019-12-06 13:51:20 -06:00
Rick Carlino 13b3971daf
Merge pull request #1615 from gabrielburnworth/staging
Fix Farmware ENV bug
2019-12-06 13:41:11 -06:00
gabrielburnworth f60f82cb06 fix farmware env translation bug 2019-12-06 08:45:56 -08:00
Rick Carlino fc74f2c717
Merge pull request #1614 from gabrielburnworth/staging
Add label to tool sensor indicator
2019-12-05 15:54:43 -06:00
gabrielburnworth b48029528f add label to tool sensor indicator 2019-12-05 12:57:44 -08:00
gabrielburnworth dc9bbe6f66 clean up views 2019-12-05 12:55:41 -08:00
gabrielburnworth 8eb348202a designer state cleanup 2019-12-05 12:53:31 -08:00
gabrielburnworth 249184661e file cleanup 2019-12-05 12:52:16 -08:00
Rick Carlino a94c666d76
Merge pull request #1613 from gabrielburnworth/staging
Fix firefox drag bug
2019-12-04 14:52:19 -06:00
gabrielburnworth e00a2cf793 fix firefox drag bug 2019-12-04 11:10:17 -08:00
Rick Carlino 24bccc522b
Merge pull request #1612 from FarmBot/master
Merge pull request #1611 from FarmBot/dec2_rc1
2019-12-02 21:19:09 -06:00
Rick Carlino 04b9f1c2e7
Merge pull request #1609 from gabrielburnworth/staging
Misc additions and fixes
2019-12-02 20:18:54 -06:00
Rick Carlino 3c42868b9e
Merge pull request #1611 from FarmBot/dec2_rc1
v8.2.3
2019-12-02 20:17:30 -06:00
gabrielburnworth 0eb8a82f2b dep updates (fe) 2019-12-02 14:09:51 -08:00
gabrielburnworth c30c312783 fix checkboxes on mozilla 2019-12-02 14:00:49 -08:00
gabrielburnworth 4f8e344c63 add zero and calibrate to command list 2019-12-02 13:56:29 -08:00
Rick Carlino e8c6257a7f
Merge pull request #1604 from gabrielburnworth/staging
Add saved gardens panel
2019-12-02 14:41:29 -06:00
Gabriel Burnworth 83932c5aaa
fix ruby test 2019-12-02 11:43:55 -08:00
gabrielburnworth 97a9ee8d57 add saved gardens panel 2019-11-27 12:11:45 -08:00
Rick Carlino fd06e84e56
Merge pull request #1602 from FarmBot/demo-plants
Update plant seeds
2019-11-27 14:05:28 -06:00
Gabriel Burnworth 06af09c939
fix tests 2019-11-27 11:31:00 -08:00
Gabriel Burnworth a003beb8f7
remove extra peripherals from express seeder 2019-11-27 11:00:16 -08:00
Gabriel Burnworth 2de8e737eb
Update plant_fixtures.yml 2019-11-27 09:34:37 -08:00
Rick Carlino f5a9be23de
Merge pull request #1601 from FarmBot/log_fix
Prevent background workers from crashing when logs are deleted.
2019-11-26 08:25:44 -06:00
Rick Carlino f13bead10e Opps 2019-11-26 07:41:27 -06:00
Rick Carlino 982956ca91 Prevent background workers from crashing when logs are deleted. 2019-11-26 07:22:29 -06:00
Rick Carlino 2300341153
Merge pull request #1597 from FarmBot/staging
v8.2.1 - Iridescent Iris
2019-11-25 16:22:19 -06:00
Rick Carlino 7f60abcaea
Merge pull request #1600 from FarmBot/inactivity_debug
Bug fix for `rake api:tidy`
2019-11-25 15:57:32 -06:00
Rick Carlino 63cb166444 Add debug point for inactivity mailer 2019-11-25 15:23:25 -06:00
Rick Carlino 76b3f9692e Account for non-activiated accounts 2019-11-25 15:05:18 -06:00
Rick Carlino 7be0569a89 Updates for better DataDog visibility. 2019-11-25 14:42:41 -06:00
Rick Carlino 38a63981eb Debug deploy 2019-11-25 13:47:42 -06:00
Rick Carlino 7676370be0 Interpolate API_PORT into docker-compose.yml. Fixes #1598 2019-11-25 13:24:14 -06:00