Skud 89a5a777e6 Merge branch 'dev' into payments-new ...

Conflicts:
	.gitignore
	app/models/ability.rb
	app/models/member.rb
	db/schema.rb

2013-06-04 19:42:00 +10:00

..

ability_spec.rb

added admin controller and index view

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

account_spec.rb

rename account details to just account

2013-05-18 10:50:36 +10:00

account_type_spec.rb

added account_types, fixed a bunch of tests

2013-05-17 16:07:46 +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 crop hierarchy basics

2013-05-14 23:24:06 +10:00

forum_spec.rb

Added friendly IDs for forum and role

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

garden_spec.rb

Added validation for garden names.

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

member_spec.rb

moved the update_order method from product to member

2013-05-20 11:35:10 +10: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

Roughly got Paypal working, after much messing around.

2013-05-28 16:37:44 +10: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

Reverted uniqueness limits for photo/planting association

2013-06-01 12:25:43 +10:00

post_spec.rb

Do validation for empty and spaces-only strings

2013-04-30 12:23:17 +01: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 model tests for scientific names

2013-01-11 12:12:41 +11:00