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

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

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

..

.gitkeep

Moving development to top level directory

2012-08-23 10:41:00 -07:00

ability.rb

added a basic crop wrangler homepage

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

account_type.rb

show account status/upgrade button in various places

2013-05-20 12:57:35 +10:00

account.rb

Added default account type of "Free" in config/applications.rb

2013-07-03 11:04:42 +01:00

authentication.rb

Store name with authentications

2013-04-09 17:38:17 +01:00

comment_sweeper.rb

fixed recent activity sorting for posts

2013-08-21 21:42:58 +10:00

comment.rb

Reordered comments: they are now DESC by default

2013-05-24 14:36:58 +10:00

crop_sweeper.rb

Cache recent crops on homepage

2013-08-14 12:38:52 +10:00

crop.rb

Added plantings_count (i.e. counter_cache) to Member

2013-08-26 13:54:09 +10:00

forum_sweeper.rb

cache posts/forums on homepage

2013-08-20 18:59:13 +10:00

forum.rb

Added friendly IDs for forum and role

2013-02-20 15:51:31 +11:00

garden_sweeper.rb

We need to refresh member thumbnails more often

2013-08-22 10:18:16 +10:00

garden.rb

fix up existing gardens with blank names.

2013-05-13 17:36:37 -07:00

member_sweeper.rb

various tweaks/fixes for caching

2013-08-19 21:34:21 +10:00

member.rb

Merge branch 'dev' into places2

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

notification.rb

Replace blank/nil notification subjects with (no subject)

2013-04-30 12:39:03 +01:00

order_item.rb

don't allow multiple order items per order

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

order.rb

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

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

photo_sweeper.rb

Update interesting_plantings when photos added/removed

2013-08-19 20:57:59 +10:00

photo.rb

Delete photo from photos/show page

2013-06-04 13:02:29 +10:00

planting_sweeper.rb

We need to refresh member thumbnails more often

2013-08-22 10:18:16 +10:00

planting.rb

Remove extra whitespace.

2013-08-30 11:59:59 +01:00

post_sweeper.rb

cache recent_posts and recent_plantings partials

2013-06-07 17:52:31 +10:00

post.rb

fixed recent activity sorting for posts

2013-08-21 21:42:58 +10:00

product.rb

added optional recommended price to products

2013-06-07 09:53:40 +10:00

role.rb

Added friendly IDs for forum and role

2013-02-20 15:51:31 +11:00

scientific_name_sweeper.rb

cache crop image with popover

2013-08-14 12:15:53 +10:00

scientific_name.rb

added creator to scientific names

2013-08-21 17:50:51 +10:00

seed_sweeper.rb

We need to refresh member thumbnails more often

2013-08-22 10:18:16 +10:00

seed.rb

Break out interesting? into its own method

2013-08-19 18:09:39 +10:00