Permalink
Switch branches/tags
Nothing to show
Commits on Oct 6, 2010
  1. remove excess routes (crops, welcome/index)

    Paul Morganthall committed Oct 6, 2010
  2. fix Dog Rose level typo

    Paul Morganthall committed Oct 6, 2010
  3. main view is now masteries#index

    Paul Morganthall committed Oct 6, 2010
  4. Merge branch 'no_multi_farm'

    Paul Morganthall committed Oct 6, 2010
  5. Remove multi-farm. YAGNI.

    Paul Morganthall committed Oct 6, 2010
  6. Merge branch 'new_crop_import'

    Paul Morganthall committed Oct 6, 2010
  7. use default_scope for market_order

    Paul Morganthall committed Oct 6, 2010
  8. update features w/new crop stats

    Paul Morganthall committed Oct 6, 2010
  9. Read crop seed from yaml. market_orders revised.

    Paul Morganthall committed Oct 6, 2010
Commits on Oct 5, 2010
  1. copy market_order from crop to mastery

    Paul Morganthall committed Oct 5, 2010
  2. reorder csv fields to match FVPS, add only new market_orders

    Paul Morganthall committed Oct 5, 2010
  3. Update crop list for Pinto Beans.

    Paul Morganthall committed Oct 5, 2010
Commits on Sep 9, 2010
  1. placeholder for time estimate

    Paul Morganthall committed Sep 9, 2010
  2. Merge branch 'market_order'

    Paul Morganthall committed Sep 9, 2010
  3. order masteries by crop.market_order

    Paul Morganthall committed Sep 9, 2010
  4. Revert "Keep crops in market_order by default."

    This reverts commit 7aaab2a.
    Paul Morganthall committed Sep 9, 2010
  5. Keep crops in market_order by default.

    Paul Morganthall committed Sep 9, 2010
  6. Merge branch 'develop'

    Paul Morganthall committed Sep 9, 2010
  7. Merge branch 'not_level2_plan' into develop

    Paul Morganthall committed Sep 9, 2010
  8. remove L2 specifics; add progress chart

    Paul Morganthall committed Sep 9, 2010
  9. Merge branch 'new_l2_numbers'

    Paul Morganthall committed Sep 9, 2010
  10. many level 2 mastery numbers fixed

    Paul Morganthall committed Sep 9, 2010
  11. sort by remaining L2 harvests; stripe rows

    Paul Morganthall committed Sep 9, 2010
  12. table for editing crop masteries

    Paul Morganthall committed Sep 9, 2010
  13. Support cancel button when editing masteries.

    Paul Morganthall committed Sep 9, 2010
  14. Get rid of flash boxes if empty.

    Paul Morganthall committed Sep 9, 2010
Commits on Sep 3, 2010
  1. add 'my farm' link, shorten to farmer_path(current_farmer)

    Paul Morganthall committed Sep 3, 2010
  2. Merge branch 'edit_masteries'

    Paul Morganthall committed Sep 3, 2010
  3. Merge branch 'fix_auth' into edit_masteries

    Paul Morganthall committed Sep 3, 2010
  4. routes and views to edit masteries

    Paul Morganthall committed Sep 3, 2010
Commits on Sep 2, 2010
  1. Not all controllers can access @farmer, use devise global

    Paul Morganthall committed Sep 2, 2010
  2. crops controller may not have farmer, skip layout

    Paul Morganthall committed Sep 2, 2010
  3. Merge branch 'add_masteries'

    Paul Morganthall committed Sep 2, 2010
  4. order masteries (kind of), display on farm

    Paul Morganthall committed Sep 2, 2010
  5. update masteries feature test w/real data

    Paul Morganthall committed Sep 2, 2010