Rick Carlino
|
be38ad830a
|
Merge branch 'master' of https://git.heroku.com/farmbot-staging into staging
|
2020-03-17 14:44:54 -05:00 |
|
Rick Carlino
|
4f03626d5f
|
Merge branch 'master' into staging
|
2020-03-17 14:43:25 -05:00 |
|
Rick Carlino
|
82f2fbef90
|
Merge pull request #1732 from FarmBot/diagnosis-icons
Diagnosis icons
|
2020-03-17 14:34:49 -05:00 |
|
gabrielburnworth
|
c736348bed
|
add icon to diagnosis indicator
|
2020-03-17 09:47:17 -07:00 |
|
gabrielburnworth
|
309737dd33
|
remove plants from default criteria
|
2020-03-17 08:34:32 -07:00 |
|
Rick Carlino
|
bc68f3e79f
|
Merge branch 'staging'
|
2020-03-16 19:08:55 -05:00 |
|
Rick Carlino
|
85be07efe5
|
Merge pull request #1730 from FarmBot/panel-updates
Groups panel updates
|
2020-03-14 14:55:03 -05:00 |
|
gabrielburnworth
|
fe9ff346a8
|
group panel updates
|
2020-03-13 14:56:14 -07:00 |
|
gabrielburnworth
|
ec878e0dae
|
tools panel updates
|
2020-03-13 14:56:14 -07:00 |
|
gabrielburnworth
|
b1c2b36a37
|
settings refactoring
|
2020-03-13 14:56:09 -07:00 |
|
gabrielburnworth
|
11f349ac89
|
dep updates (fe)
|
2020-03-13 14:06:02 -07:00 |
|
Rick Carlino
|
67373e4f7e
|
Merge pull request #1726 from FabioDessi/issue-1685
Improve grid line labels in farm designer #2
|
2020-03-12 12:07:05 -05:00 |
|
Fabio Dessi
|
dd46830b9d
|
Merge branch 'staging' into issue-1685
|
2020-03-03 09:02:11 +01:00 |
|
Fabio Dessi
|
63b333746d
|
[WIP] Grid line improvements for y axis
|
2020-03-03 08:41:29 +01:00 |
|
Rick Carlino
|
2c6033f57a
|
Merge pull request #1724 from FarmBot/labeling-improvements
Labeling improvements and refactoring
|
2020-02-28 13:51:48 -06:00 |
|
gabrielburnworth
|
4d2ea00130
|
settings updates
|
2020-02-28 09:01:19 -08:00 |
|
gabrielburnworth
|
c8c57d5340
|
organize German translation file
|
2020-02-28 08:37:58 -08:00 |
|
gabrielburnworth
|
4013291787
|
fix commas
|
2020-02-28 08:35:32 -08:00 |
|
gabrielburnworth
|
25d944e4b7
|
add missing panels
|
2020-02-28 08:35:17 -08:00 |
|
gabrielburnworth
|
de6f886586
|
remove unused code
|
2020-02-28 08:34:54 -08:00 |
|
gabrielburnworth
|
800625e8a1
|
improve element annotation
|
2020-02-28 08:34:28 -08:00 |
|
Rick Carlino
|
bce0700cd9
|
Merge pull request #1723 from FarmBot/staging
v9.2.0 - Jolly Juniper
|
2020-02-27 15:37:03 -06:00 |
|
Rick Carlino
|
cccecf58f6
|
Merge pull request #1722 from MarcRoland/patch-1
Update de.json
|
2020-02-27 15:14:23 -06:00 |
|
MarcRoland
|
c2308cb987
|
Update de.json
|
2020-02-27 11:52:14 -08:00 |
|
Rick Carlino
|
ffbf660143
|
Merge pull request #1721 from FarmBot/cleanup
Cleanup
|
2020-02-26 13:30:15 -08:00 |
|
gabrielburnworth
|
edb96d3ca8
|
cleanup and refactoring
|
2020-02-26 12:17:54 -08:00 |
|
Rick Carlino
|
a49e5e67ba
|
Merge pull request #1720 from FarmBot/misc-updates
Misc fixes and updates
|
2020-02-26 11:32:19 -08:00 |
|
gabrielburnworth
|
90ddd78bb8
|
remove old tools page
|
2020-02-26 10:28:21 -08:00 |
|
gabrielburnworth
|
9bd98aca1e
|
misc updates
|
2020-02-26 10:28:16 -08:00 |
|
Rick Carlino
|
49fdced812
|
Merge pull request #1718 from FarmBot/updates
Dep Upgrades
|
2020-02-26 06:47:23 -08:00 |
|
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
|
9f1cf4eedd
|
Loosen restriction on `package` attr of `flash_firmware`.
|
2020-02-20 18:13:46 -06:00 |
|
Rick Carlino
|
afceaf25e0
|
Add test for flash_firmware node
|
2020-02-20 18:03:23 -06:00 |
|
Rick Carlino
|
e5389b747e
|
Begin work on 'flash firmware' button
|
2020-02-20 17:32:58 -06:00 |
|
Rick Carlino
|
a5b1d5631e
|
Merge pull request #1701 from FarmBot/staging
v9.1.3 - Jolly Juniper
|
2020-02-20 12:57:33 -06: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 |