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

added admin controller and index view

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

account_types_controller_spec.rb

cleaned up boring controller tests

2013-07-08 13:24:26 +10:00

accounts_controller_spec.rb

cleaned up boring controller tests

2013-07-08 13:24:26 +10:00

admin_controller_spec.rb

Made admin/newsletter page with list of subscribers

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

authentications_controller_spec.rb

cleaned up boring controller tests

2013-07-08 13:24:26 +10:00

comments_controller_spec.rb

Review and cleanup of JSON API

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

crops_controller_spec.rb

added a basic crop wrangler homepage

2013-08-21 21:24:22 +10:00

forums_controller_spec.rb

cleaned up boring controller tests

2013-07-08 13:24:26 +10:00

gardens_controller_spec.rb

removed boring tests from controllers

2013-07-08 13:09:37 +10:00

home_controller_spec.rb

moved model access from controller to views to help caching

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

member_controller_spec.rb

Add places pages

2013-08-02 00:15:51 -04:00

notifications_controller_spec.rb

cleaned up boring controller tests

2013-07-08 13:24:26 +10:00

order_items_controller_spec.rb

cleaned up boring controller tests

2013-07-08 13:24:26 +10:00

orders_controller_spec.rb

cleaned up boring controller tests

2013-07-08 13:24:26 +10:00

photos_controller_spec.rb

Refactor ALL THE THINGS

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

places_controller_spec.rb

Add places pages

2013-08-02 00:15:51 -04:00

plantings_controller_spec.rb

Set planting owner automatically in controller

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

posts_controller_spec.rb

removed boring tests from controllers

2013-07-08 13:09:37 +10:00

products_controller_spec.rb

cleaned up boring controller tests

2013-07-08 13:24:26 +10:00

registrations_controller_spec.rb

connect to flickr

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

roles_controller_spec.rb

cleaned up boring controller tests

2013-07-08 13:24:26 +10:00

scientific_names_controller_spec.rb

cleaned up boring controller tests

2013-07-08 13:24:26 +10:00

seeds_controller_spec.rb

rearranged routing to avoid ?owner_id=99

2013-07-26 15:29:30 +10:00

shop_controller_spec.rb

only let them order one thing (for now)

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