Yoong Kang Lim bd8be01ec7 Merge branch 'dev' into editprofile ...

Conflicts:
	CONTRIBUTORS.md

2014-11-13 21:38:05 +11:00

..

controllers

Added seeds_by_crop_path routes and stuff

2014-10-19 14:25:47 +01:00

factories

Merge pull request #432 from pozorvlak/alternate_crop_names

2014-10-19 16:34:44 +01:00

features

Merge branch 'dev' into editprofile

2014-11-13 21:38:05 +11:00

helpers

Show aggregate 'grown from' data on crop page

2013-11-06 11:21:08 +11:00

lib/haml/filters

Included PT bug# to its test description. Test using the case from the bug

2014-09-19 16:00:25 +10:00

mailers

Added tests for planting reminder email

2014-09-12 12:30:04 +10:00

models

Fixed bug in deleting unused photos

2014-11-11 19:29:32 +11:00

requests

rails g scaffold PlantPart...

2013-10-30 23:32:20 +00:00

routing

rails g scaffold PlantPart...

2013-10-30 23:32:20 +00:00

support

fix edge case where user types in full name of crop and doesn't use autocomplete suggestions

2014-08-02 20:44:19 +10:00

views

Plantings index should display finished at date instead of planted at under the finished column.

2014-11-11 22:41:29 +11:00

spec_helper.rb

Attempt at writing tests for planting reminder email

2014-10-15 15:52:13 +01:00