Rick Carlino
|
696350343b
|
Override `created_at` value with `planted_at` value when available
|
2020-04-27 16:09:12 -05:00 |
|
Rick Carlino
|
87c22d4a96
|
Set default `planted_at` value
|
2020-04-27 15:05:53 -05:00 |
|
Rick Carlino
|
9f35dd9992
|
Merge pull request #1769 from FarmBot/dep_updates
Dependency upgrades
|
2020-04-24 11:10:19 -05:00 |
|
gabrielburnworth
|
14bf5216e0
|
dep updates (fe)
|
2020-04-24 08:22:24 -07:00 |
|
gabrielburnworth
|
1d196d633a
|
Merge branch 'master' of https://github.com/FarmBot/Farmbot-Web-App into staging
|
2020-04-24 06:49:58 -07:00 |
|
Rick Carlino
|
de607e3e3a
|
Merge pull request #1768 from FarmBot/master-hotfix/update-fallback
Minor hotfix
|
2020-04-23 20:07:29 -05:00 |
|
gabrielburnworth
|
d931cd1b84
|
update coverage task
|
2020-04-23 16:55:52 -07:00 |
|
gabrielburnworth
|
b3f93dd678
|
update fallback
|
2020-04-23 15:58:33 -07:00 |
|
Rick Carlino
|
7f9ecd450d
|
Merge pull request #1767 from FarmBot/fe_updates
Misc updates
|
2020-04-23 15:04:05 -05:00 |
|
gabrielburnworth
|
69462e4b60
|
weeks refactor
|
2020-04-23 12:12:04 -07:00 |
|
gabrielburnworth
|
d3732aed20
|
version updates
|
2020-04-23 12:11:25 -07:00 |
|
Rick Carlino
|
6213028f0f
|
Merge pull request #1765 from FarmBot/mark_as
Mark As step updates
|
2020-04-21 20:38:10 -05:00 |
|
gabrielburnworth
|
281813369e
|
resource_update -> update_resource (fe)
|
2020-04-21 14:39:55 -07:00 |
|
Rick Carlino
|
1014eece5f
|
Merge pull request #1764 from FarmBot/minor-fixes
Minor fixes
|
2020-04-20 18:06:23 -05:00 |
|
gabrielburnworth
|
6f484ab2e3
|
minor fixes
|
2020-04-20 14:07:40 -07:00 |
|
Rick Carlino
|
0bd6d9a967
|
Merge pull request #1763 from FarmBot/mark_as
Add weed status for Mark As step
|
2020-04-20 09:26:28 -05:00 |
|
gabrielburnworth
|
25b2f18c4c
|
add weed status for mark as
|
2020-04-17 16:13:26 -07:00 |
|
Rick Carlino
|
1556084dbd
|
Merge branch 'staging' into always_upgrade
|
2020-04-17 13:22:18 -05:00 |
|
Rick Carlino
|
0571100229
|
Remind custoemrs to upgrade FBOS before troubleshooting
|
2020-04-17 13:13:32 -05:00 |
|
Rick Carlino
|
d6909f439c
|
Merge pull request #1760 from FarmBot/mark_as
Delete dump_info node
|
2020-04-17 11:54:09 -05:00 |
|
Rick Carlino
|
36b5c90b65
|
Merge remote-tracking branch 'origin/mark_as' into mark_as
|
2020-04-17 11:09:29 -05:00 |
|
Rick Carlino
|
f3ac957485
|
Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into mark_as
|
2020-04-17 11:08:31 -05:00 |
|
Rick Carlino
|
6f834517ca
|
More dump_info removal
|
2020-04-17 11:08:17 -05:00 |
|
Rick Carlino
|
44c3f7dc4e
|
Merge branch 'staging' into mark_as
|
2020-04-17 11:01:53 -05:00 |
|
Rick Carlino
|
5bb77c1c14
|
Delete dump_info node
|
2020-04-17 10:58:36 -05:00 |
|
Rick Carlino
|
3ee1478a58
|
Merge pull request #1759 from FarmBot/mark_as
Plant stage updates.
|
2020-04-17 10:58:02 -05:00 |
|
Rick Carlino
|
df9e0ef26b
|
Update PLANT_STAGES
|
2020-04-17 09:56:53 -05:00 |
|
Rick Carlino
|
0e02ca06ee
|
Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into mark_as
|
2020-04-16 15:57:29 -05:00 |
|
Rick Carlino
|
643bcb1a37
|
Merge pull request #1758 from FarmBot/mark_as
Phase 0: Ability to pass variables to MARK AS step
|
2020-04-16 13:27:52 -05:00 |
|
Rick Carlino
|
88b20a73ea
|
Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into mark_as
|
2020-04-16 13:26:29 -05:00 |
|
Rick Carlino
|
e8a8165635
|
Merge branch 'staging' into mark_as
|
2020-04-16 13:04:15 -05:00 |
|
Rick Carlino
|
588d4eb36e
|
Merge pull request #1757 from FarmBot/settings_updates
Settings and dependency updates
|
2020-04-16 13:04:03 -05:00 |
|
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 |