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

..

admin

added admin controller and index view

2013-05-31 10:23:06 +10:00

account_types_controller_spec.rb

account details: there can only be one

2013-05-18 09:33:26 +10:00

accounts_controller_spec.rb

rename account details to just account

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

admin_controller_spec.rb

added admin controller and index view

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

authentications_controller_spec.rb

added connections to settings page, fixed tests

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

comments_controller_spec.rb

Reordered comments: they are now DESC by default

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

crops_controller_spec.rb

Converting crops RSS to HAML

2013-05-24 12:22:41 +10:00

forums_controller_spec.rb

limit crop wrangling to crop wranglers

2013-03-18 17:02:22 +11:00

gardens_controller_spec.rb

Delete gardens

2013-03-20 12:30:38 +11:00

home_controller_spec.rb

Put locations in geolocated_member factory names.

2013-04-25 23:27:52 +01:00

member_controller_spec.rb

connect to flickr

2013-04-30 23:01:18 +10:00

notifications_controller_spec.rb

Move reply_link into a helper.

2013-05-01 23:45:07 +01:00

order_items_controller_spec.rb

fixed bug with non-int prices

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

orders_controller_spec.rb

Vendored the activemerchant gem to help with testing

2013-05-31 12:15:23 +10:00

photos_controller_spec.rb

Avoid duplicate photos on plantings (or vice versa)

2013-06-01 12:07:17 +10:00

plantings_controller_spec.rb

Replaced plantings RSS with HAML

2013-05-24 12:43:51 +10:00

posts_controller_spec.rb

Added RSS feed for comments on a single post

2013-05-24 13:43:06 +10:00

products_controller_spec.rb

added basic index page for shop

2013-05-08 15:05:38 +10:00

registrations_controller_spec.rb

connect to flickr

2013-04-30 23:01:18 +10:00

roles_controller_spec.rb

limit crop wrangling to crop wranglers

2013-03-18 17:02:22 +11:00

scientific_names_controller_spec.rb

make it easier to wrangle scientific names

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

shop_controller_spec.rb

only let them order one thing (for now)

2013-05-16 20:58:43 +10:00