Miles Gould 4701bd1b2e Merge branch 'dev' into places2 ...

Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example

2013-08-31 15:49:30 +01:00

..

ability_spec.rb

added admin controller and index view

2013-05-29 14:37:42 +10:00

account_spec.rb

added account status info in various places

2013-06-06 21:07:54 +10:00

account_type_spec.rb

misc tidying up

2013-06-04 20:27:56 +10:00

authentication_spec.rb

added connections to settings page, fixed tests

2013-04-18 23:41:04 +10:00

comment_spec.rb

Reordered comments: they are now DESC by default

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

crop_spec.rb

Added plantings_count (i.e. counter_cache) to Member

2013-08-26 13:54:09 +10:00

forum_spec.rb

cleaning up tests on postgres

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

garden_spec.rb

Added validation for garden names.

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

member_spec.rb

Merge branch 'dev' into places2

2013-08-31 15:49:30 +01:00

notification_spec.rb

Replace blank/nil notification subjects with (no subject)

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

order_item_spec.rb

don't allow multiple order items per order

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

order_spec.rb

Merge pull request #243 from lucymclaughlin/forex_link

2013-07-04 01:28:40 -07:00

photo_spec.rb

Add metadata to photos and display it on photos/show.

2013-05-09 14:51:38 +01:00

planting_spec.rb

Added 'bulb' as a 'planted_from' option.

2013-08-30 15:08:23 +10:00

post_spec.rb

Fixed failing timestamp test on postgres

2013-07-08 13:28:59 +10:00

product_spec.rb

moved the update_order method from product to member

2013-05-20 11:35:10 +10:00

role_spec.rb

Added friendly IDs for forum and role

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

scientific_name_spec.rb

added creator to scientific names

2013-08-21 17:50:51 +10:00

seed_spec.rb

Only interesting (locatable) seeds are shown on homepage

2013-08-07 16:26:51 +10:00