Skud 2b6bdeda16 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev ...

Conflicts:
	spec/views/crops/show.html.haml_spec.rb

2013-07-23 19:35:31 +10: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

misc tidying up

2013-06-04 20:27:56 +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

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

2013-07-23 19:35:31 +10:00

devise

connect to flickr

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

forums

General prettification and making it look nice.

2013-02-20 15:42:44 +11:00

gardens

I'd rather not use Member.new

2013-02-01 13:37:33 +11:00

home

connected seeds into other parts of the site

2013-07-15 23:29:14 +10:00

layouts

added account status info in various places

2013-06-06 21:07:54 +10:00

members

Merge branch 'dev' into payments-new

2013-05-28 14:07:53 +10: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

view/select older flickr photos

2013-07-05 22:07:55 +10:00

plantings

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

2013-07-23 19:35:31 +10:00

policy

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

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

posts

Added titles to comment items in RSS

2013-05-24 14:43:45 +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

make it easier to wrangle scientific names

2013-05-09 11:39:22 +10:00

seeds

seed page: cleaned up views/tests for location

2013-07-18 23:54:51 +10: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