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

..

controllers

Merge branch 'dev' into payments-new

2013-06-04 19:42:00 +10:00

factories

Merge branch 'dev' into payments-new

2013-06-04 19:42:00 +10:00

helpers

Delete unused photos_helper.

2013-05-31 11:28:59 +01:00

lib/haml/filters

Tests for Haml::Filters::EscapedMarkdown.

2013-05-16 18:00:00 +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 payments-new

2013-06-04 19:42:00 +10:00

requests

added account type and paid months columns to product

2013-05-18 10:27:08 +10:00

routing

Merge branch 'dev' into payments-new

2013-06-04 19:42:00 +10:00

support

limit crop wrangling to crop wranglers

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

views

Merge branch 'dev' into payments-new

2013-06-04 19:42:00 +10:00

spec_helper.rb

Death to Spork! Death! Death!

2013-02-12 13:17:14 +00:00