Rick Carlino
|
efea80b593
|
Deprecate `resource_update`. Add `update_resource`.
|
2020-04-15 13:46:46 -05:00 |
|
gabrielburnworth
|
c75d93f3c4
|
dep updates (fe)
|
2020-04-14 16:03:48 -07:00 |
|
gabrielburnworth
|
bee1e0e074
|
settings panel updates
|
2020-04-14 16:03:38 -07:00 |
|
Rick Carlino
|
4375a935f0
|
Merge pull request #1756 from FarmBot/recovery_release
v9.3.0 - Jolly Juniper
|
2020-04-14 09:33:24 -05:00 |
|
Rick Carlino
|
7d5fe7c9f6
|
Deploy fixes
|
2020-04-14 09:09:07 -05:00 |
|
Rick Carlino
|
e801d53d51
|
Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into staging
|
2020-04-14 08:47:43 -05:00 |
|
Rick Carlino
|
bf0a03d11d
|
Merge pull request #1754 from FarmBot/search_refactor
Search Refactor
|
2020-04-14 08:46:51 -05:00 |
|
gabrielburnworth
|
ec757b1b29
|
misc bug fixes
|
2020-04-13 23:38:49 -07:00 |
|
gabrielburnworth
|
3c3b120b9b
|
refactor search fields
|
2020-04-13 18:15:11 -07:00 |
|
Rick Carlino
|
046035ab9e
|
Merge pull request #1753 from FarmBot/staging
v9.2.6 - Jolly Juniper
|
2020-04-13 17:27:06 -05:00 |
|
Rick Carlino
|
52b481e831
|
Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into staging
|
2020-04-13 16:43:16 -05:00 |
|
Rick Carlino
|
73422eb8ea
|
Merge pull request #1752 from FarmBot/criteria_ui_updates
Criteria UI updates
|
2020-04-13 16:42:26 -05:00 |
|
gabrielburnworth
|
b087e08f13
|
criteria ui updates
|
2020-04-13 12:24:38 -07:00 |
|
Rick Carlino
|
1e1b405c32
|
Merge pull request #1751 from FarmBot/staging
v9.2.6 release
|
2020-04-12 11:49:39 -05:00 |
|
Rick Carlino
|
dccea4e474
|
Merge pull request #1750 from FarmBot/image_updates
v9.2.6 - Jolly Juniper
|
2020-04-12 11:22:26 -05:00 |
|
Rick Carlino
|
91d86bad0c
|
Update structure.sql
|
2020-04-12 10:55:08 -05:00 |
|
Rick Carlino
|
bfe4df68a8
|
Fix typo in migration
|
2020-04-12 10:41:53 -05:00 |
|
Rick Carlino
|
dd6a43d901
|
Dep updates
|
2020-04-12 10:33:49 -05:00 |
|
Rick Carlino
|
726cd6d4e7
|
Merge branch 'master' into image_updates
|
2020-04-12 10:24:48 -05:00 |
|
Rick Carlino
|
d730cd9260
|
Bump image limit from 100 to 450
|
2020-04-12 10:24:17 -05:00 |
|
Rick Carlino
|
eb8cfd3c91
|
Merge pull request #1749 from FarmBot/staging
v9.2.5 - Jolly Juniper
|
2020-04-08 14:00:45 -05:00 |
|
Rick Carlino
|
8f9bd4a5e7
|
Merge pull request #1746 from FarmBot/weeds
Add new weed pointer type
|
2020-04-02 13:51:59 -05:00 |
|
gabrielburnworth
|
3ebf434945
|
use Weed instead of GenericPointer for weeds
|
2020-04-02 10:24:33 -07:00 |
|
Rick Carlino
|
92a7194c6e
|
Merge pull request #1744 from FarmBot/bugfix/add-tool
Fix add tool bug
|
2020-03-31 09:32:33 -05:00 |
|
gabrielburnworth
|
24ad841d7f
|
add and edit tool improvements
|
2020-03-30 17:57:32 -07:00 |
|
Rick Carlino
|
b45f806309
|
Merge pull request #1740 from FarmBot/staging
v9.2.4
|
2020-03-24 12:43:37 -05:00 |
|
Rick Carlino
|
cf7ec86106
|
Merge pull request #1738 from FarmBot/weeds
Part I: Fork "Weed" point type from "GenericPointer"
|
2020-03-22 20:53:42 -05:00 |
|
Rick Carlino
|
37f7517c51
|
Temporary changes to pass type checking. May not be correct.
|
2020-03-22 19:26:19 -05:00 |
|
Rick Carlino
|
2a04803dc6
|
Fork `Weed` pointer_type from GenericPointer, not Plant
|
2020-03-22 18:57:47 -05:00 |
|
Rick Carlino
|
3700406687
|
Add new `Weed` PointerType
|
2020-03-22 18:32:00 -05:00 |
|
Rick Carlino
|
1ba0ff7871
|
Merge pull request #1737 from FarmBot/deps
Routine Dep Upgrades
|
2020-03-22 14:07:55 -05:00 |
|
Rick Carlino
|
be23cd44b5
|
Routine dep upgrades: JS
|
2020-03-20 11:09:54 -05:00 |
|
Rick Carlino
|
43d1b9da33
|
Routine dep upgrades: Ruby
|
2020-03-20 10:31:18 -05:00 |
|
Rick Carlino
|
bda30bae09
|
Merge pull request #1736 from FarmBot/staging
v9.2.3 - Jolly Juniper
|
2020-03-18 16:23:53 -05:00 |
|
Rick Carlino
|
de21cb16da
|
Merge branch 'master' of https://git.heroku.com/farmbot-production into staging
|
2020-03-18 15:56:33 -05:00 |
|
Rick Carlino
|
0a153bc656
|
Merge branch 'master' of github.com:FarmBot/Farmbot-Web-App into staging
|
2020-03-18 15:56:14 -05:00 |
|
Rick Carlino
|
149451c270
|
Merge pull request #1735 from FarmBot/bot-online-bugfix
Minor bug fix
|
2020-03-18 15:46:50 -05:00 |
|
Gabriel Burnworth
|
d7de315c20
|
flip bot online boolean
|
2020-03-18 13:09:11 -07:00 |
|
Rick Carlino
|
61c09b69b9
|
Merge branch 'master' of github.com:FarmBot/Farmbot-Web-App
|
2020-03-17 15:29:47 -05:00 |
|
Rick Carlino
|
863071824b
|
Merge pull request #1733 from FarmBot/staging
v9.2.2 - Jolly Juniper
|
2020-03-17 15:27:37 -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
|
3a9ea9af79
|
Merge pull request #1731 from FarmBot/staging
v9.2.1 - Jolly Juniper
|
2020-03-16 19:19:41 -05: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 |