Commit Graph

9696 Commits (jebba)

Author SHA1 Message Date
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
Rick Carlino 4119865370
Merge branch 'staging' into setup_fix 2020-02-05 09:10:10 -06:00
Rick Carlino da00ca4d98 Update ubuntu_setup.sh 2020-02-05 09:01:34 -06:00
Pitou 9288757f97 Allow horizontal scroll on small devices 2020-02-05 00:03:06 +01:00
Rick Carlino 66962e1bdb
Merge pull request #1679 from FarmBot/remove_diag_dumps
Remove diag dumps
2020-02-04 14:23:40 -06:00
Rick Carlino 0b4ea1e385 Remove diag dumps 2020-02-04 13:42:40 -06:00
Rick Carlino 11d08aea99
Merge pull request #1673 from FarmBot/staging
v9.1.0
2020-02-03 08:38:04 -06:00
Rick Carlino 1934e4ba7c
Merge pull request #1676 from FarmBot/connectivity_widget_updates
Verbiage Updates to WiFi Connectivity Error Message
2020-01-31 10:43:50 -06:00
Rick Carlino 1cfa4f9e9e Verbiage updates 2020-01-31 09:51:11 -06:00
Rick Carlino 13b4e159df Merge branch 'master' of https://git.heroku.com/farmbot-production into staging 2020-01-29 08:44:12 -06:00
Rick Carlino e84e05a45e
Merge pull request #1672 from FarmBot/download-page
OS download page
2020-01-29 08:07:58 -06:00
gabrielburnworth 313e92b1c3 update circle config coverage check 2020-01-28 12:16:45 -08:00
gabrielburnworth 9dfd31da10 add os download page 2020-01-28 12:02:12 -08:00
Rick Carlino c3029d06ed
Merge pull request #1671 from FarmBot/staging
Recovery Deployment, 28 JAN
2020-01-28 13:02:21 -06:00
Rick Carlino 7e1cad0f9f
Merge pull request #1670 from FarmBot/firmware_quickfix
Firmware quickfix
2020-01-28 11:54:39 -06:00
Rick Carlino f0eadf2c98 Fix tests 2020-01-28 11:05:48 -06:00
Rick Carlino 9ccb0fab68 Possible workaround for v9 firmware reset issues. 2020-01-28 08:27:59 -06:00
Rick Carlino e5b20c15c9 Merge branch 'master' of github.com:FarmBot/Farmbot-Web-App 2020-01-25 09:20:59 -06:00
Rick Carlino f11a553231
Merge pull request #1668 from FarmBot/staging
v9.0.4 - Jolly Juniper
2020-01-25 09:19:57 -06:00
Rick Carlino bbd711eb24
Merge pull request #1667 from FarmBot/node_upgrade
Dependency upgrades
2020-01-24 16:09:43 -06:00
gabrielburnworth 981d005423 dep updates (fe) 2020-01-24 11:54:58 -08:00
gabrielburnworth 3b2422607f update ci config 2020-01-24 11:54:49 -08:00
Gabriel Burnworth e05b4a3d1c
upgrade node version 2020-01-23 16:04:34 -08:00
Rick Carlino 39e5418b3e
Merge pull request #1666 from FarmBot/dep_upgrades
Dep Upgrades
2020-01-23 14:45:04 -06:00
Rick Carlino fc7f98b79b Dep upgrades 2020-01-23 14:20:12 -06:00
Rick Carlino 4451c4decd
Merge pull request #1665 from FarmBot/criteria_groups
Criteria-based groups (API Only)
2020-01-17 08:44:14 -06:00
Rick Carlino 6fbe9ec1df Fix broke test 2020-01-16 16:54:17 -06:00
Rick Carlino 77ee927ce8 FBJS Update 2020-01-16 16:44:02 -06:00
Rick Carlino d829c4e3dd Commented code removal 2020-01-16 16:15:42 -06:00
Rick Carlino b8eb47b0cc ✔️ 2020-01-16 16:13:01 -06:00
Rick Carlino ff596c6f1f DRY up the `criteria` declaration in ::Mutations 2020-01-16 15:51:36 -06:00