Mikael Nordfeldth 7ccd36849e Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly ...

Conflicts:
	plugins/OStatus/OStatusPlugin.php

master vs. nightly thing

2015-11-05 16:16:02 +01:00

..

actions

ShowfavoritesAction now extends ShowstreamAction

2015-07-11 00:28:32 +02:00

classes

newUri might as well be put in Managed_DataObject

2015-10-10 21:31:26 +02:00

forms

FavoritePlugin is now an "ActivityVerbHandlerPlugin"

2015-03-10 15:39:35 +01:00

lib

Move AlreadyFulfilled check to Fave::addNew

2015-03-10 11:56:23 +01:00

locale

Snapshot of the Transifex translation project - October 2015

2015-10-04 18:23:01 +02:00

EVENTS.txt

Fave::addNew now calls Notice::saveActivity

2015-02-03 16:34:11 +01:00

FavoritePlugin.php

Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly

2015-11-05 16:16:02 +01:00