Brenda Wallace 276accc314 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 ...

Conflicts:
	Gemfile.lock

2018-12-30 13:02:02 +13:00

..

admin

Added back link to CMS

2018-06-04 16:37:57 +12:00

alternate_names

Spec updates

2018-10-16 14:08:37 +13:00

comments

Comments from deleted members need to show

2018-06-04 16:02:07 +12:00

crops

Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5

2018-12-30 13:02:02 +13:00

devise

Fixed link to associated flickr, twitter, facebook accountss

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

errors

Show a 404 page on record not found

2018-06-04 10:59:34 +12:00

forums

Truncate, escape, and DRY og:description fields

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

gardens

Order garden's plantings by planted_at

2018-04-21 13:03:46 +12:00

harvests

create rss feed for harvests

2018-06-10 20:38:43 -07:00

home

Expanding layout to use full screen

2018-04-01 12:44:59 +12:00

layouts

Fix up footer

2018-06-04 16:44:51 +12:00

members

format fixes

2018-04-21 21:55:29 -05: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

Merge branch 'dev' into feature/i18n

2018-04-26 17:26:55 +12:00

posts

Comment button same style

2018-04-19 12:10:19 -05:00

roles

Nicer layout on editing roles

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

scientific_names

Spec updates

2018-10-16 14:08:37 +13:00

seeds

More markup updates to fit specs

2018-10-08 14:18:19 +13:00

shared

Renamed should_be_finshed? to late?

2018-04-23 13:44:53 +12:00

support

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

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