Mackenzie Morgan 7ca89908cd merge from upstream

2015-02-01 22:00:52 -05: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

update follow member code to be rails 4 compatible

2014-12-14 14:51:18 +11:00

accounts_controller.rb

update follow member code to be rails 4 compatible

2014-12-14 14:51:18 +11:00

admin_controller.rb

Made admin/newsletter page with list of subscribers

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

alternate_names_controller.rb

update follow member code to be rails 4 compatible

2014-12-14 14:51:18 +11:00

application_controller.rb

add current_password to permitted params

2015-01-11 14:55:12 +11:00

authentications_controller.rb

Remove the authentications index page

2015-01-11 11:57:13 +00:00

comments_controller.rb

decoy commit to test if travis / phantomjs error was spurious

2015-01-15 22:23:27 +11:00

crops_controller.rb

merge

2015-02-01 00:14:52 +11:00

follows_controller.rb

Don't try to load a Follow before it's been created.

2015-01-23 11:39:20 +00:00

forums_controller.rb

replaced caching using observers with a key-based (and simplified) caching system

2014-12-19 21:17:43 +11:00

gardens_controller.rb

replaced caching using observers with a key-based (and simplified) caching system

2014-12-19 21:17:43 +11:00

harvests_controller.rb

Merge branch 'dev' of github.com:growstuff/growstuff into standard_weights

2015-01-30 22:48:50 -05: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

replaced caching using observers with a key-based (and simplified) caching system

2014-12-19 21:17:43 +11:00

notifications_controller.rb

update follow member code to be rails 4 compatible

2014-12-14 14:51:18 +11:00

order_items_controller.rb

update follow member code to be rails 4 compatible

2014-12-14 14:51:18 +11:00

orders_controller.rb

remove depricated method

2015-01-10 15:46:36 +11:00

passwords_controller.rb

fix redirect after reset password bug

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

photos_controller.rb

basics of garden photos

2015-01-27 00:54:05 -05: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

implement strong parameters instead of protected attributes

2014-11-18 20:08:54 +11:00

plantings_controller.rb

fix planted_at on planting create bug

2015-01-11 14:00:51 +11:00

policy_controller.rb

Merging in changes from dev to mygarden branch

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

posts_controller.rb

replaced caching using observers with a key-based (and simplified) caching system

2014-12-19 21:17:43 +11:00

products_controller.rb

update follow member code to be rails 4 compatible

2014-12-14 14:51:18 +11:00

registrations_controller.rb

replaced caching using observers with a key-based (and simplified) caching system

2014-12-19 21:17:43 +11:00

roles_controller.rb

update follow member code to be rails 4 compatible

2014-12-14 14:51:18 +11:00

scientific_names_controller.rb

replaced caching using observers with a key-based (and simplified) caching system

2014-12-19 21:17:43 +11:00

seeds_controller.rb

replaced caching using observers with a key-based (and simplified) caching system

2014-12-19 21:17:43 +11: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