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

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

2013-08-31 15:49:30 +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

Review and cleanup of JSON API

2013-08-05 13:29:07 +10:00

accounts_controller.rb

Review and cleanup of JSON API

2013-08-05 13:29:07 +10:00

admin_controller.rb

Made admin/newsletter page with list of subscribers

2013-08-27 21:49:54 +10:00

application_controller.rb

don't redirect to homepage after signin

2013-08-21 22:51:40 +10:00

authentications_controller.rb

Review and cleanup of JSON API

2013-08-05 13:29:07 +10:00

comments_controller.rb

fixed recent activity sorting for posts

2013-08-21 21:42:58 +10:00

crops_controller.rb

Merge pull request #284 from Skud/wrangler-homepage

2013-08-21 21:54:04 -07:00

forums_controller.rb

cache posts/forums on homepage

2013-08-20 18:59:13 +10:00

gardens_controller.rb

cache stats and member thumbnails on homepage

2013-08-14 11:47:09 +10:00

home_controller.rb

moved model access from controller to views to help caching

2013-08-19 20:35:00 +10:00

members_controller.rb

Merge branch 'dev' of https://github.com/Growstuff/growstuff into places2

2013-08-21 17:35:31 +10:00

notifications_controller.rb

Move reply_link into a helper.

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

order_items_controller.rb

Review and cleanup of JSON API

2013-08-05 13:29:07 +10:00

orders_controller.rb

We have to actually complete the purchase!

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

photos_controller.rb

Update interesting_plantings when photos added/removed

2013-08-19 20:57:59 +10:00

places_controller.rb

Improve readability of controllers/places slightly.

2013-08-28 12:24:12 +01:00

plantings_controller.rb

Set planting owner automatically in controller

2013-08-26 12:23:41 +10:00

policy_controller.rb

Merging in changes from dev to mygarden branch

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

posts_controller.rb

Eager loading for frequently-accessed/database-heavy pages

2013-08-22 10:18:33 +10:00

products_controller.rb

Review and cleanup of JSON API

2013-08-05 13:29:07 +10:00

registrations_controller.rb

cache stats and member thumbnails on homepage

2013-08-14 11:47:09 +10:00

roles_controller.rb

Review and cleanup of JSON API

2013-08-05 13:29:07 +10:00

scientific_names_controller.rb

Added creator to scientific name views etc

2013-08-21 17:52:10 +10:00

seeds_controller.rb

Eager loading for frequently-accessed/database-heavy pages

2013-08-22 10:18:33 +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