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

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

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

..

about

added contact link to footer

2013-04-29 09:39:30 +10:00

account_types

added account_types, fixed a bunch of tests

2013-05-17 16:07:46 +10:00

accounts

Create free account type if it doesn't exist; fix tests.

2013-06-26 10:55:19 +01:00

admin

Made admin/newsletter page with list of subscribers

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

authentications

Delete specs for unused views and controller methods.

2013-04-09 17:56:34 +01:00

comments

Added titles to comment items in RSS

2013-05-24 14:43:45 +10:00

crops

added a basic crop wrangler homepage

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

devise

Add newsletter subscription checkbox

2013-08-27 21:22:35 +10:00

forums

tiny test fixes to bring things up to date with reality

2013-08-20 14:48:17 +10:00

gardens

make gardens page look like plantings/seeds

2013-07-26 14:48:55 +10:00

home

Refactor ALL THE THINGS

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

layouts

added 'Places' to top nav

2013-08-12 10:48:06 +10:00

members

Merge branch 'dev' into places2

2013-08-23 13:29:37 +01:00

notifications

Merge pull request #193 from pozorvlak/replylink

2013-05-13 17:45:39 -07:00

notifier

Added reply link to notification email.

2013-04-29 18:55:13 +10:00

orders

Fix bug in order total; add conversion link to order show.

2013-07-03 14:10:37 +01:00

photos

New photo: show an h2 with the name of the current set

2013-07-18 14:45:36 +01:00

places

Credit OpenStreetMap under ODbL.

2013-08-23 14:36:30 +01:00

plantings

added help text/links to planting form

2013-08-30 16:37:59 +10:00

policy

make the site/app name (growstuff) a config var

2013-03-19 14:41:54 +11:00

posts

removed author fields from RSS

2013-08-05 12:23:36 +10:00

products

display recommended price on product admin pages

2013-06-07 11:36:03 +10:00

roles

various tweaks based on comments on phazel's work

2013-03-21 12:37:57 +11:00

scientific_names

Added creator to scientific name views etc

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

seeds

Merge branch 'dev' into places2

2013-08-23 13:29:37 +01:00

shop

Merge pull request #243 from lucymclaughlin/forex_link

2013-07-04 01:28:40 -07:00

support

removed Courtney from about section

2013-04-29 09:43:50 +10:00