Miles Gould cebd6e05ac Merge branch 'dev' into logged-out ...

Conflicts:
	spec/views/home/index_spec.rb

2013-06-04 13:54:49 +01:00

..

admin

minor tweakage to admin/order/search

2013-06-04 21:15:29 +10:00

about_controller.rb

added contact link to footer

2013-04-29 09:39:30 +10:00

account_types_controller.rb

account details: there can only be one

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

accounts_controller.rb

rename account details to just account

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

admin_controller.rb

added admin controller and index view

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

application_controller.rb

Document current_user vs current_member usage.

2013-03-29 15:19:01 +00:00

authentications_controller.rb

tell user to connect to flickr

2013-05-08 21:17:03 +10:00

comments_controller.rb

Added RSS feed for all comments

2013-05-24 13:29:17 +10:00

crops_controller.rb

Converting crops RSS to HAML

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

forums_controller.rb

hooked roles up to cancan

2013-02-20 14:53:11 +11:00

gardens_controller.rb

Delete gardens

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

home_controller.rb

Changes to homepage

2013-06-04 12:59:37 +01:00

members_controller.rb

"auth" helper method in Member

2013-05-08 15:55:32 +01:00

notifications_controller.rb

Move reply_link into a helper.

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

order_items_controller.rb

pass validation errors through controller

2013-05-28 14:14:59 +10:00

orders_controller.rb

Vendored the activemerchant gem to help with testing

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

photos_controller.rb

Avoid duplicate photos on plantings (or vice versa)

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

plantings_controller.rb

Replaced plantings RSS with HAML

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

policy_controller.rb

Merging in changes from dev to mygarden branch

2012-12-05 21:05:40 +11:00

posts_controller.rb

Added RSS feed for comments on a single post

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

products_controller.rb

only admins can mess with products/orders for now

2013-05-07 21:24:26 +10:00

registrations_controller.rb

"auth" helper method in Member

2013-05-08 15:55:32 +01:00

roles_controller.rb

hooked roles up to cancan

2013-02-20 14:53:11 +11:00

scientific_names_controller.rb

make it easier to wrangle scientific names

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

shop_controller.rb

only let them order one thing (for now)

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

support_controller.rb

added support/faq page

2013-03-21 22:34:04 +11:00