Brenda Wallace 40d71ae070 Merge branch 'dev' into fix/photo-order-1547

2018-03-12 11:41:12 +13:00

..

admin

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

alternate_names

Fixed trailing quote in haml

2017-02-04 15:07:18 +13:00

comments

comment says "Member Deleted" when they are

2017-06-02 22:50:48 +12:00

crops

Merge branch 'dev' into fix/photo-order-1547

2018-03-12 11:41:12 +13:00

devise

Fixed link to associated flickr, twitter, facebook accountss

2017-12-13 22:23:22 +13:00

forums

Truncate, escape, and DRY og:description fields

2017-02-08 09:49:19 +13:00

gardens

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

harvests

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

home

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

layouts

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

members

Added back the member's last login

2018-02-09 10:53:05 +13:00

notifications

Display messages even when member is deleted

2017-10-20 23:44:51 +13:00

notifier

Removing references to Discource (talk.growstuff.org)

2017-03-12 10:51:25 +13:00

photos

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

places

Inactive plantings show as tiny thumbnails

2017-05-28 17:13:04 +12:00

plant_parts

Fixed up unescaped model attribute

2017-11-29 20:59:37 +13:00

plantings

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

posts

Post says Member Deleted when they are

2017-06-02 22:51:48 +12:00

roles

Nicer layout on editing roles

2017-12-17 12:11:55 +13:00

scientific_names

Haml clean up for scientific names views

2017-02-13 07:32:43 +13:00

seeds

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

shared

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

support

Merge remote-tracking branch 'upstream/dev' into add_facebook_signup

2016-07-05 03:09:36 +09:30