FarmDoc

• 

  vnarah2 <vnarah@illinois.edu> 06 Dec 2018 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
• 

  vnarah2 <vnarah@illinois.edu> 06 Dec 2018 0923f9126b88ad0862b96ab5d1b4de0d8df0f442 m

  FD-101: Removed commented out code

  • src/app.config.js (version 0923f9126b88ad0862b96ab5d1b4de0d8df0f442) (diffs)
  • src/components/FarmerCharts.jsx (version 0923f9126b88ad0862b96ab5d1b4de0d8df0f442) (diffs)
• 

  vnarah2 <vnarah@illinois.edu> 06 Dec 2018 4921d29ab5fa52bbc2963f3f08ba7133d9c587a6 m

  FD-101: Modal popup to show sample bins

  • src/components/FarmerCharts.jsx (version 4921d29ab5fa52bbc2963f3f08ba7133d9c587a6) (diffs)
  • src/images/bin-arc.png (version 4921d29ab5fa52bbc2963f3f08ba7133d9c587a6) (diffs)
  • src/images/bin-plc.png (version 4921d29ab5fa52bbc2963f3f08ba7133d9c587a6) (diffs)
  • src/images/sample-dist1.png (version 4921d29ab5fa52bbc2963f3f08ba7133d9c587a6) (diffs)
  • src/images/sample-dist2.png (version 4921d29ab5fa52bbc2963f3f08ba7133d9c587a6) (diffs)
  • src/images/sample-dist3.png (version 4921d29ab5fa52bbc2963f3f08ba7133d9c587a6) (diffs)
  • src/images/sample-dist4.png (version 4921d29ab5fa52bbc2963f3f08ba7133d9c587a6) (diffs)
  • src/images/sample-dist5.png (version 4921d29ab5fa52bbc2963f3f08ba7133d9c587a6) (diffs)
• 

  Christopher Navarro 06 Dec 2018 6c13d18a77e4200fedd24fd470978756d0b6b7e8 m

  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
• 

  vnarah2 <vnarah@illinois.edu> 29 Nov 2018 59d35078300762b1c83328b36cd622587017adc9 m

  FD-97: Fixed a typo in login message

  • src/app.messages.js (version 59d35078300762b1c83328b36cd622587017adc9) (diffs)
  • src/components/Login.jsx (version 59d35078300762b1c83328b36cd622587017adc9) (diffs)
• 

  vnarah2 <vnarah@illinois.edu> 29 Nov 2018 d5bec38192b9e6eacb1005780b91020213fb355c m

  FD-103: Handled datawolf Queued status

  • src/components/FDRunModel.jsx (version d5bec38192b9e6eacb1005780b91020213fb355c) (diffs)
• 

  vnarah2 <vnarah@illinois.edu> 28 Nov 2018 740737e7eeaeff692e808ada4e968946c8f999f8 m

  FD-99: Added the css, images. Updated layout

  • src/app.config.js (version 740737e7eeaeff692e808ada4e968946c8f999f8) (diffs)
  • src/app.messages.js (version 740737e7eeaeff692e808ada4e968946c8f999f8) (diffs)
  • src/components/FDRunModel.jsx (version 740737e7eeaeff692e808ada4e968946c8f999f8) (diffs)
  • src/components/Header.jsx (version 740737e7eeaeff692e808ada4e968946c8f999f8) (diffs)
  • src/components/HomePage.jsx (version 740737e7eeaeff692e808ada4e968946c8f999f8) (diffs)
  • src/components/Login.jsx (version 740737e7eeaeff692e808ada4e968946c8f999f8) (diffs)
  • src/images/farmdoc-rep-image.png (version 740737e7eeaeff692e808ada4e968946c8f999f8) (diffs)
  • src/styles/header.css (version 740737e7eeaeff692e808ada4e968946c8f999f8) (diffs)
  • src/styles/main.css (version 740737e7eeaeff692e808ada4e968946c8f999f8) (diffs)
• 

  vnarah2 <vnarah@illinois.edu> 27 Nov 2018 c448cee2b31480964b5ab2a02853f925b7f38a6b m

  FD-99: Improve frontend layout to match mockups

  • src/app.messages.js (version c448cee2b31480964b5ab2a02853f925b7f38a6b) (diffs)
  • src/components/FDRunModel.jsx (version c448cee2b31480964b5ab2a02853f925b7f38a6b) (diffs)
  • src/components/Header.jsx (version c448cee2b31480964b5ab2a02853f925b7f38a6b) (diffs)
  • src/components/HomePage.jsx (version c448cee2b31480964b5ab2a02853f925b7f38a6b) (diffs)
  • src/components/Login.jsx (version c448cee2b31480964b5ab2a02853f925b7f38a6b) (diffs)
  • src/styles/header.css (version c448cee2b31480964b5ab2a02853f925b7f38a6b) (diffs)
  • src/styles/home-page.css (version c448cee2b31480964b5ab2a02853f925b7f38a6b) (diffs)
  • src/styles/main.css (version c448cee2b31480964b5ab2a02853f925b7f38a6b) (diffs)
  • src/styles/styles.scss (version c448cee2b31480964b5ab2a02853f925b7f38a6b) (diffs)