Brenda Wallace b04bdd111a Merge remote-tracking branch 'upstream/dev' into mailbox ...

Conflicts:
	app/views/harvests/show.html.haml

2019-08-08 11:23:41 +12:00

..

admin

tidy display of discard member on admin page

2019-07-21 17:26:45 +12:00

alternate_names

…

comments

fixed up comments by deleted members

2019-07-21 20:24:39 +12:00

conversations

tests for restoring conversations

2019-08-07 22:28:18 +12:00

crops

Choose crop photos by most liked

2019-07-15 11:58:46 +00:00

devise

Couple breadcrumbs tidied

2019-07-16 03:15:04 +00:00

errors

…

follows

…

forums

…

garden_types

…

gardens

gardens show all as a button

2019-08-07 16:18:59 +12:00

harvests

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

2019-08-08 11:23:41 +12:00

home

…

layouts

fixed unread count on headers

2019-07-21 20:24:30 +12:00

likes

Choose crop photos by most liked

2019-07-15 11:58:46 +00:00

mailboxer

TRying to get mailboxxer working

2019-07-11 22:28:51 +12:00

members

don't show progress bars on annuals

2019-07-28 14:28:08 +12:00

messages

Removed todo

2019-07-23 09:38:30 +12:00

notifier

…

photos

Merge remote-tracking branch 'upstream/dev' into renamed-photographings-associations

2019-07-16 12:12:16 +12:00

places

Link to open streetmap using https

2019-07-10 09:03:05 +00:00

plant_parts

…

plantings

tidy up plantings view

2019-08-07 16:19:37 +12:00

posts

line up display of posts

2019-07-21 20:26:04 +12:00

roles

…

scientific_names

…

seeds

use message path instead of notifications

2019-07-21 19:14:22 +12:00

shared

link to markdown docs using https

2019-07-10 09:03:05 +00:00

support

…

timeline

…