Skud 840a5efc4e Merge remote-tracking branch 'upstream/bootstrap3' into dev ...

Conflicts:
	Gemfile.lock

2014-08-28 08:00:10 +10:00

..

admin

moved admin order search into a model method

2013-09-13 13:38:11 +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

remove extra method

2014-08-21 20:11:10 -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

harvests_controller.rb

allow per-owner CSV downloads

2013-09-25 16:11:08 +10:00

home_controller.rb

Removed intentional errors accidentally left in when testing better_errors

2013-10-25 12:34:13 +11:00

members_controller.rb

Redid places/show using the all-javascript method.

2013-09-11 12:14:18 +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

removed spurious puts

2013-09-19 10:57:11 +10:00

passwords_controller.rb

fix redirect after reset password bug

2014-07-15 22:57:07 +10:00

photos_controller.rb

Update interesting_plantings when photos added/removed

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

places_controller.rb

Fixed bug with capitalisation of usernames in map popups

2014-06-12 18:49:06 -07:00

plant_parts_controller.rb

Add friendly URLs to plant parts.

2013-10-31 00:19:48 +00:00

plantings_controller.rb

Added CSV for plantings

2013-09-25 16:57:27 +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

Fixed typo

2014-08-22 10:25:40 +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

Added CSV for seeds

2013-09-25 17:15:42 +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