Commit Graph

9576 Commits (updates)

Author SHA1 Message Date
Rick Carlino 6bc0034d67 Dep updates 2020-02-26 08:18:25 -06:00
Rick Carlino 8e0cf2603c
Merge pull request #1715 from FarmBot/minor-fixes
Minor bug fixes and upgrades
2020-02-24 10:19:51 -08:00
gabrielburnworth 4a0035b9eb minor bug fixes 2020-02-24 08:56:26 -08:00
gabrielburnworth 19eebde8e2 dep updates (fe) 2020-02-24 08:55:37 -08:00
Rick Carlino cd52670c0b
Merge pull request #1711 from FarmBot/days_ago
days => days_ago
2020-02-24 08:52:04 -08:00
Rick Carlino fd62ccd9aa
Merge branch 'staging' into days_ago 2020-02-21 20:17:33 -06:00
Rick Carlino 1a4a106179 days => days_ago 2020-02-21 20:13:29 -06:00
Rick Carlino ee8851b0af
Merge pull request #1709 from FarmBot/tool-updates
Tool updates
2020-02-21 10:32:41 -06:00
gabrielburnworth 40150a307c tool updates 2020-02-20 19:06:43 -08:00
Rick Carlino 26a4f66a75
Merge pull request #1700 from FarmBot/tool_deleteion
Fixes for Tool deletion issues
2020-02-19 11:57:17 -06:00
Rick Carlino 73222de627 Dismount tool prior to deletion 2020-02-19 11:15:18 -06:00
Rick Carlino ddb480921e Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into tool_deleteion 2020-02-19 11:14:54 -06:00
Rick Carlino 5945d2a38d
Merge pull request #1699 from FarmBot/model_version_updates
Settings and version updates part 2
2020-02-18 16:16:24 -06:00
gabrielburnworth a04ec59ba5 model and version updates part 2 2020-02-18 12:52:52 -08:00
Rick Carlino 310686508f
Merge pull request #1698 from FarmBot/model_updates
Settings and version updates
2020-02-16 08:25:23 -06:00
gabrielburnworth 66b5e3c962 refactor external urls 2020-02-15 11:11:50 -08:00
gabrielburnworth cf0af59e42 model and version updates 2020-02-15 11:08:35 -08:00
gabrielburnworth 9dab0c4bc5 hardware settings ui updates 2020-02-15 11:06:45 -08:00
Rick Carlino 94ee85bd83 Merge branch 'master' of github.com:FarmBot/Farmbot-Web-App 2020-02-14 08:50:32 -06:00
Rick Carlino 672aae441b Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App 2020-02-14 08:50:26 -06:00
Rick Carlino 3d0223e56a
Merge pull request #1696 from FarmBot/staging
v9.1.1 - Jolly Juniper
2020-02-14 08:48:49 -06:00
Rick Carlino 93d2521511
Merge pull request #1695 from FarmBot/new-models
Add new models
2020-02-14 08:24:51 -06:00
gabrielburnworth aafd84fff7 support new models 2020-02-13 16:53:20 -08:00
Rick Carlino 8f8056a3e3
Merge pull request #1694 from FarmBot/sensor_reading_limits
Cap sensor readings to 5,000 count
2020-02-13 17:07:01 -06:00
Rick Carlino c1a9bc63bf SensorReadingController test improvement 2020-02-13 13:15:37 -06:00
Rick Carlino 2a6fe06ba3 Cap sensor readings to 5,000 count 2020-02-13 13:10:48 -06:00
Rick Carlino 6c3e60999c
Merge pull request #1693 from FarmBot/email_verbiage
Verbiage updates
2020-02-12 19:26:53 -06:00
Rick Carlino 10a025369d Verbiage updates 2020-02-12 18:35:02 -06:00
Rick Carlino e490aa83f6
Merge pull request #1691 from FarmBot/staging
v9.1.1 - Jolly Juniper
2020-02-10 10:43:19 -06:00
Rick Carlino eec9790a0b
Merge pull request #1690 from FarmBot/monday
PointGroup, SensorReading updates
2020-02-10 10:07:29 -06:00
Rick Carlino de140d02a5 Add pagination to numerous API endpoints 2020-02-10 09:05:42 -06:00
Rick Carlino c0fab4a38c fill `nil` criteria attributes with PointGroup::DEFAULT_CRITERIA 2020-02-10 08:34:05 -06:00
Rick Carlino 313008b21b
Merge pull request #1689 from FabioDessi/issue-1685
Improve grid line labels in farm designer
2020-02-10 08:08:10 -06:00
Fabio Dessi 2aed62b9f8 [FIX] code coverage extension 2020-02-09 14:38:01 +01:00
Fabio Dessi 4fe9d89912 [WIP] Grid line improvements for x axis 2020-02-09 10:59:03 +01:00
Rick Carlino e989e66d9b
Merge pull request #1687 from FarmBot/fix-blinky-tests
Fix blinky ruby tests
2020-02-08 16:10:40 -06:00
gabrielburnworth 3367bc667b fix blinky ruby tests 2020-02-08 10:56:47 -08:00
Rick Carlino 93f5d59bf4 Merge pull request #1686 from FarmBot/groups-updates
Groups UI updates
2020-02-08 11:23:28 -06:00
gabrielburnworth 1af5af0696 board type updates 2020-02-07 15:17:31 -08:00
gabrielburnworth e46b4de0bb os download page updates 2020-02-07 15:05:59 -08:00
gabrielburnworth 464b730cd8 groups updates 2020-02-07 15:05:16 -08:00
Rick Carlino 837cbe8a85
Merge pull request #1684 from FabioDessi/grid_line_improvements
zoom on grid now changes strokeWidth instead of zoom
2020-02-07 15:06:01 -06:00
Fabio Dessi 8f3a674f9d zoom on grid now changes strokeWidth instead of zoom 2020-02-07 06:16:30 +01:00
Rick Carlino 3e300defa1
Merge pull request #1682 from FarmBot/staging
v9.1.0 - Jolly Juniper
2020-02-06 07:44:37 -06:00
Rick Carlino cd685d6590
Merge pull request #1683 from FarmBot/ci_got_slower
Fix blinky test.
2020-02-05 18:12:45 -06:00
Rick Carlino 05f6c52f67 reduce time diff check in test 2020-02-05 17:42:33 -06:00
Rick Carlino a565261517
Merge pull request #1681 from PitouGames/logs-responsive
Logs responsive
2020-02-05 17:21:40 -06:00
Rick Carlino e5a154e3a0
Merge branch 'staging' into logs-responsive 2020-02-05 13:31:19 -06:00
Rick Carlino 286e6b5bbb
Merge pull request #1680 from FarmBot/setup_fix
Update ubuntu_setup.sh
2020-02-05 13:26:09 -06:00
Pitou ea031aaf4d Fix french translation 2020-02-05 19:26:47 +01:00