vnarah2 <vnarah@illinois.edu>
1640be3b3877db8e5e113d22d438fa16e79edcc9
1640be3b3877db8e5e113d22d438fa16e79edcc9
Merge remote-tracking branch 'origin/feature/FD-101-show-placeholder-images-for-simulation-distribution-and-binned-payouts' into feature/FD-101-show-placeholder-images-for-simulation-distribution-and-binned-payouts
# Conflicts:
# src/components/FarmerCharts.jsx
06 Dec 2018
vnarah2 <vnarah@illinois.edu>
0923f9126b88ad0862b96ab5d1b4de0d8df0f442
m 0923f9126b88ad0862b96ab5d1b4de0d8df0f442
FD-101 : Removed commented out code
06 Dec 2018
vnarah2 <vnarah@illinois.edu>
4921d29ab5fa52bbc2963f3f08ba7133d9c587a6
m 4921d29ab5fa52bbc2963f3f08ba7133d9c587a6
FD-101 : Modal popup to show sample bins
06 Dec 2018
Christopher Navarro
6c13d18a77e4200fedd24fd470978756d0b6b7e8
m 6c13d18a77e4200fedd24fd470978756d0b6b7e8
Merge pull request #15 in FD/farmdoc from feature/FD-97-enhance-look-and-feel-and-layout-to-match-covercrop-s to develop
* commit '59d35078300762b1c83328b36cd622587017adc9':
FD-97 : Fixed a typo in login message
FD-99 : Added the css, images. Updated layout
FD-99 : Improve frontend layout to match mockups
06 Dec 2018
vnarah2 <vnarah@illinois.edu>
59d35078300762b1c83328b36cd622587017adc9
m 59d35078300762b1c83328b36cd622587017adc9
FD-97 : Fixed a typo in login message
29 Nov 2018