connor rigby
|
4ab651ece7
|
Fix missed merge conflict issue
|
2018-02-15 07:59:14 -08:00 |
|
|
connor rigby
|
5f57b46ee2
|
Fix compiler warning
|
2018-02-15 07:58:49 -08:00 |
|
|
connor rigby
|
e39bf9341f
|
Fix compiler warning
|
2018-02-15 07:58:30 -08:00 |
|
|
connor rigby
|
b6d8c77f93
|
Pull staging, fix merge conflicts
|
2018-02-15 07:57:39 -08:00 |
|
|
connor rigby
|
1ff4d61dd4
|
Merge branch 'staging' of github.com:Farmbot/farmbot_os into 6.3.0/staging_next
|
2018-02-15 07:52:36 -08:00 |
|
|
connor rigby
|
dfb0afbd78
|
Finish up dl fw settings
|
2018-02-15 07:51:40 -08:00 |
|
|
connor rigby
|
c64d6f25fe
|
Change fw to use fbos as source of truth. Moving to api next
|
2018-02-15 07:51:40 -08:00 |
|
|
connor rigby
|
d0a8adc6fd
|
Fix weird syntax error
|
2018-02-15 07:51:40 -08:00 |
|
|
connor rigby
|
4b3ab1112e
|
bump fw
|
2018-02-15 07:51:40 -08:00 |
|
|
connor rigby
|
1c3907a4c5
|
[WIP] Everything is broken
|
2018-02-15 07:51:40 -08:00 |
|
|
connor rigby
|
45a7ce57c4
|
Use api for fw storage.
|
2018-02-15 07:51:40 -08:00 |
|
|
Connor Rigby
|
a9391dfb05
|
Merge pull request #445 from FarmBot/staging
6.2.0 Release
|
2018-02-14 10:02:42 -08:00 |
|
|
Connor Rigby
|
c1f6334212
|
Merge pull request #444 from FarmBot/staging
Fix settings sync breaking fw
|
2018-02-13 10:29:17 -08:00 |
|
|
connor rigby
|
e820e9a719
|
Merge branch 'beta' of github.com:Farmbot/farmbot_os into staging
|
2018-02-13 10:26:10 -08:00 |
|
|
connor rigby
|
5ae6b01c7b
|
Fix missing var
|
2018-02-13 10:22:59 -08:00 |
|
|
connor rigby
|
fe6563c488
|
Make sure to reset if settings fail to sync
|
2018-02-13 09:26:51 -08:00 |
|
|
connor rigby
|
1875a1bcb5
|
Add special setting to ignore settings updates.
|
2018-02-13 09:25:29 -08:00 |
|
|
Connor Rigby
|
5bc35bd958
|
Merge pull request #443 from FarmBot/staging
Misc log updates and bug fixes
|
2018-02-13 08:18:05 -08:00 |
|
|
connor rigby
|
a03a8ca8f7
|
Merge branch 'staging' of github.com:Farmbot/farmbot_os into 6.3.0/staging_next
|
2018-02-13 08:09:14 -08:00 |
|
|
connor rigby
|
a033f0fa87
|
speedup Makefile resolution
|
2018-02-13 08:08:26 -08:00 |
|
|
connor rigby
|
dfbc24e2d0
|
Bump nerves_bootstrap version
|
2018-02-13 07:59:49 -08:00 |
|
|
connor rigby
|
02a14c4246
|
Fix bad pattern for first party farmware installer
|
2018-02-13 07:56:53 -08:00 |
|
|
connor rigby
|
28bcf5a5a2
|
Change sync cmd log type
|
2018-02-09 12:16:20 -08:00 |
|
|
connor rigby
|
266d7c68ab
|
Merge branch 'staging' of github.com:Farmbot/farmbot_os into 6.3.0/staging_next
|
2018-02-09 11:47:41 -08:00 |
|
|
connor rigby
|
473d68be92
|
Merge branch 'beta' of github.com:Farmbot/farmbot_os into staging
|
2018-02-09 11:24:43 -08:00 |
|
|
connor rigby
|
2fdf8dc766
|
Clean up logs
|
2018-02-09 11:24:35 -08:00 |
|
|
connor rigby
|
031b0e563a
|
Clean up logs
|
2018-02-09 11:17:37 -08:00 |
|
|
connor rigby
|
db64fc492a
|
Update changelog
|
2018-02-09 08:29:57 -08:00 |
|
|
Connor Rigby
|
144ea2daba
|
More auth/ownership stuff
|
2018-02-09 08:28:09 -08:00 |
|
|
Connor Rigby
|
ecd41bfd95
|
Add new cs node for changing environments
|
2018-02-09 08:28:09 -08:00 |
|
|
Connor Rigby
|
3089a7c5aa
|
Try to fix test env again
|
2018-02-09 08:28:09 -08:00 |
|
|
Connor Rigby
|
6ab7bd9f18
|
Try to fix test env again
|
2018-02-09 08:28:09 -08:00 |
|
|
Connor Rigby
|
fb17911677
|
Fix test env
|
2018-02-09 08:28:09 -08:00 |
|
|
Connor Rigby
|
156e327b5f
|
Fix typos
|
2018-02-09 08:28:09 -08:00 |
|
|
Connor Rigby
|
a9990a5df7
|
Start adding Global config database
|
2018-02-09 08:28:09 -08:00 |
|
|
Connor Rigby
|
f2b7265806
|
Migrate default databases. :heavy-checkmark:
|
2018-02-09 08:28:09 -08:00 |
|
|
connor rigby
|
e0637e9d9a
|
Bump changelog
|
2018-02-09 08:22:51 -08:00 |
|
|
connor rigby
|
141063177f
|
Add missing files
|
2018-02-09 08:21:46 -08:00 |
|
|
connor rigby
|
da66b35ce5
|
Fix slicer, add tests
|
2018-02-09 08:21:46 -08:00 |
|
|
connor rigby
|
8120d1a416
|
Add new files
|
2018-02-09 08:21:46 -08:00 |
|
|
connor rigby
|
843aff99ca
|
Don't know if we will need this
|
2018-02-09 08:21:46 -08:00 |
|
|
connor rigby
|
af214ad14f
|
Update changelog
|
2018-02-09 08:20:14 -08:00 |
|
|
connor rigby
|
46e2244d5b
|
Fix old api
|
2018-02-09 08:19:25 -08:00 |
|
|
connor rigby
|
04507339e4
|
Add call to fwup
|
2018-02-09 08:19:25 -08:00 |
|
|
connor rigby
|
f50ff6ab28
|
Finish refactor.
|
2018-02-09 08:19:25 -08:00 |
|
|
connor rigby
|
40d1d9ecde
|
Start refactoring update handler. [WIP]
|
2018-02-09 08:19:25 -08:00 |
|
|
connor rigby
|
0413855d74
|
Bump changelog
|
2018-02-09 08:18:56 -08:00 |
|
|
connor rigby
|
81e9eda69b
|
Bump version.
|
2018-02-09 08:18:41 -08:00 |
|
|
Connor Rigby
|
0afb0f6343
|
Merge pull request #438 from FarmBot/staging
Heavily test settings syncing
|
2018-02-02 08:26:01 -08:00 |
|
|
connor rigby
|
c0dfab41b3
|
Heavily test settings syncing
|
2018-01-31 08:31:29 -08:00 |
|