|
Indira Gutierrez Polo
|
85b256b7109c825bf5cddef1cfc129844bdb80fc
|
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/bitbucket/scm/ccrop/cover-crops into feature/CCROP-154-cover-crop-dashboard
# Conflicts:
# CHANGELOG.md
# src/components/MyFarmPage.jsx |
|
|
Christopher Navarro
|
b7ec15b090dc898e692df1930a25011389210193
m |
Merge pull request #53 in CCROP/cover-crops from feature/CCROP-135-send-post-put-request-when-user-modify-fertilizer to develop
* commit '2d07b8bbf4553fcb08b13e578faa737f431ceb7d':
add back import
fix typo
rename fertilizer
fix patch json
add fertilizer component |
|
|
|
Indira Gutierrez Polo
|
cf4692ee3450243088b0860ef509cdfabf02f966
m |
After successful login redirect user to the start a job page |
|
|
Yan Zhao
|
2d07b8bbf4553fcb08b13e578faa737f431ceb7d
m |
add back import |
|
|
|
Yan Zhao
|
63c9171eb81db94dc309d4b7e3f23e09f1ef1533
m |
fix typo |
|
