Skud 89a5a777e6 Merge branch 'dev' into payments-new ...

Conflicts:
	.gitignore
	app/models/ability.rb
	app/models/member.rb
	db/schema.rb

2013-06-04 19:42:00 +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

rename account details to just account

2013-05-18 10:50:36 +10:00

admin

added admin controller and index view

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

authentications

Make the authentication into a link to your Twitter page.

2013-04-09 17:38:30 +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 comments-rss

2013-05-24 14:57:17 +10:00

devise

Added flickr icon, updated twitter icon

2013-05-14 22:33:55 +10:00

forums

various tweaks based on comments on phazel's work

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

gardens

various tweaks based on comments on phazel's work

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

home

added admin controller and index view

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

layouts

added admin controller and index view

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

members

Merge branch 'dev' into payments-new

2013-05-28 14:07:53 +10:00

notifications

Added a reply link to the notifications/show page

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

notifier

Added reply link to notification email.

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

orders

added admin controller and index view

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

photos

added alt tag

2013-05-31 23:37:48 +10:00

plantings

rearranged notes/pics on plantings page

2013-06-01 11:32:49 +10:00

policy

removed duplicate title from copyright policy

2013-03-20 11:23:45 +11:00

posts

Added titles to comment items in RSS

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

products

added account type and paid months columns to product

2013-05-18 10:27:08 +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

shared

delegate crop system name and url

2013-04-02 12:39:07 +11:00

shop

Don't display shop if they already have a paid account

2013-05-22 10:57:20 +10:00

support

removed Courtney from about section

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