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

..

.gitkeep

Moving development to top level directory

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

ability.rb

Merge branch 'dev' into payments-new

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

account_type.rb

show account status/upgrade button in various places

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

account.rb

rename account details to just account

2013-05-18 10:50:36 +10: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

added crop hierarchy basics

2013-05-14 23:24:06 +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

Merge branch 'dev' into payments-new

2013-06-04 19:42:00 +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

record paypal token/payer id on completion, for reference

2013-05-29 13:41:34 +10:00

photo.rb

Reverted uniqueness limits for photo/planting association

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

planting.rb

Reverted uniqueness limits for photo/planting association

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

post.rb

Do validation for empty and spaces-only strings

2013-04-30 12:23:17 +01:00

product.rb

moved the update_order method from product to member

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