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

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

2013-08-31 15:49:30 +01:00

..

controllers

Merge branch 'dev' into places2

2013-08-31 15:49:30 +01:00

factories

Merge branch 'newsletter' of https://github.com/Skud/growstuff into Skud-newsletter

2013-08-29 00:06:44 +10:00

helpers

Tidied up seed views and added location stuff

2013-07-17 19:37:35 -07:00

lib/haml/filters

Reinstate Geocoder lookup

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

mailers

Method to send email notifications.

2013-03-27 11:23:52 +00:00

migrations

give each user a garden. note: tests broken!

2012-11-05 14:29:04 +08:00

models

Merge branch 'dev' into places2

2013-08-31 15:49:30 +01:00

requests

Review and cleanup of JSON API

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

routing

rails g scaffold seed...

2013-07-15 22:53:29 +10:00

support

limit crop wrangling to crop wranglers

2013-03-18 17:02:22 +11:00

views

Merge branch 'dev' into places2

2013-08-31 15:49:30 +01:00

spec_helper.rb

Filter spec files out of coverage reports.

2013-06-13 20:38:26 +01:00