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

More form tidy up

2019-04-27 19:19:42 +12:00

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

[CodeFactor] Apply fixes

2019-05-24 01:24:29 +00:00

follows

Move follows from members controller to follows controller

2019-01-06 08:45:42 +13:00

forums

Updating forum pages to match specs

2019-06-24 21:35:01 +12:00

garden_types

pull-right becomes text-right

2019-05-19 11:50:04 +12:00

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

Back out the max homepage items change

2019-07-06 11:16:21 +00:00

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

Removing references to Discource (talk.growstuff.org)

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

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

Fixed up unescaped model attribute

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

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

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

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

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

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

timeline

tidy

2019-07-08 10:04:08 +12:00