Skud 2b6bdeda16 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev ...

Conflicts:
	spec/views/crops/show.html.haml_spec.rb

2013-07-23 19:35:31 +10:00

..

.gitkeep

Moving development to top level directory

2012-08-23 10:41:00 -07:00

ability.rb

prettified seed-related views

2013-07-15 22:53:30 +10:00

account_type.rb

show account status/upgrade button in various places

2013-05-20 12:57:35 +10:00

account.rb

Added default account type of "Free" in config/applications.rb

2013-07-03 11:04:42 +01:00

authentication.rb

Store name with authentications

2013-04-09 17:38:17 +01:00

comment.rb

Reordered comments: they are now DESC by default

2013-05-24 14:36:58 +10:00

crop.rb

need to test sunniness/planted_from.blank?

2013-07-11 22:15:56 +10:00

forum.rb

Added friendly IDs for forum and role

2013-02-20 15:51:31 +11:00

garden.rb

fix up existing gardens with blank names.

2013-05-13 17:36:37 -07:00

member.rb

connected seeds into other parts of the site

2013-07-15 23:29:14 +10:00

notification.rb

Replace blank/nil notification subjects with (no subject)

2013-04-30 12:39:03 +01:00

order_item.rb

don't allow multiple order items per order

2013-05-22 11:22:10 +10:00

order.rb

Fix bug in order total; add conversion link to order show.

2013-07-03 14:10:37 +01:00

photo.rb

Delete photo from photos/show page

2013-06-04 13:02:29 +10:00

planting_sweeper.rb

cache recent_posts and recent_plantings partials

2013-06-07 17:52:31 +10:00

planting.rb

added planted_from (eg seed, seedling)

2013-07-05 20:53:11 +10:00

post_sweeper.rb

cache recent_posts and recent_plantings partials

2013-06-07 17:52:31 +10:00

post.rb

cleaning up tests on postgres

2013-07-08 12:18:51 +10:00

product.rb

added optional recommended price to products

2013-06-07 09:53:40 +10:00

role.rb

Added friendly IDs for forum and role

2013-02-20 15:51:31 +11:00

scientific_name.rb

Fixed tests by getting rid of valid_session

2012-11-26 19:04:43 +11:00

seed.rb

Added tradable and tradable_to to seeds

2013-07-17 18:25:55 -07:00