Skip to navigation
Skip to content

Code commits

CoverCrop

Indira Gutierrez Polo 18 Dec 2018 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 06 Dec 2018 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 04 Dec 2018 cf4692ee3450243088b0860ef509cdfabf02f966 m

After successful login redirect user to the start a job page
- CHANGELOG.md (version cf4692ee3450243088b0860ef509cdfabf02f966) (diffs)
- src/components/Login.jsx (version cf4692ee3450243088b0860ef509cdfabf02f966) (diffs)
Yan Zhao 30 Nov 2018 2d07b8bbf4553fcb08b13e578faa737f431ceb7d m

add back import
- src/components/CropHistory.jsx (version 2d07b8bbf4553fcb08b13e578faa737f431ceb7d) (diffs)
Yan Zhao 21 Nov 2018 63c9171eb81db94dc309d4b7e3f23e09f1ef1533 m

fix typo
Yan Zhao 15 Nov 2018 fa78b5faff9e4dac0e45e88c4ab4a48ec30402ad m

rename fertilizer
- src/components/Fertilizer.js (version fa78b5faff9e4dac0e45e88c4ab4a48ec30402ad) (diffs)
- src/components/Fertilizer.jsx (version fa78b5faff9e4dac0e45e88c4ab4a48ec30402ad) (diffs)
Yan Zhao 15 Nov 2018 6f40fa73fdef6e98927fdb16ed302dc7e13f3443 m

fix patch json
Yan Zhao 15 Nov 2018 5c2308dc900e2957ef5abb1f8b6998f0254d38da m

Merge remote-tracking branch 'origin/develop' into feature/CCROP-135-send-post-put-request-when-user-modify-fertilizer
Yan Zhao 15 Nov 2018 bc89887e4fc921632db74dcc41c323b052a88ec7 m

add fertilizer component