quix0rs-gnu-social.git
2 years agoIntroduced common_location_shared() to check if location sharing is always, master
Roland Haeder [Sun, 24 Jan 2016 15:10:23 +0000 (16:10 +0100)]
Introduced common_location_shared() to check if location sharing is always,
never or by-user enabled. This commit also excluded geometa.js if location
sharing is for any reason disabled as this loads an external reference from
Google.

Signed-off-by: Roland Haeder <roland@mxchange.org>
2 years agoMerge remote-tracking branch 'upstream/master'
Roland Haeder [Sun, 24 Jan 2016 15:13:11 +0000 (16:13 +0100)]
Merge remote-tracking branch 'upstream/master'

2 years agoDid the OpportunisticQM fixes in the wrong order upstream-master
Mikael Nordfeldth [Mon, 11 Jan 2016 12:35:29 +0000 (13:35 +0100)]
Did the OpportunisticQM fixes in the wrong order

2 years agouse connect_timeout value for execution margin
Mikael Nordfeldth [Fri, 22 Jan 2016 11:19:17 +0000 (12:19 +0100)]
use connect_timeout value for execution margin

2 years agodefault connect_timeout to 5 instead of extlib 10
Mikael Nordfeldth [Mon, 18 Jan 2016 21:01:45 +0000 (22:01 +0100)]
default connect_timeout to 5 instead of extlib 10

2 years agoHandle exceptions when salmon slapping
Mikael Nordfeldth [Wed, 20 Jan 2016 13:55:41 +0000 (14:55 +0100)]
Handle exceptions when salmon slapping

Make it so notifyDeferred actually _always_ throws exceptions and handle
them in the places it is called.

2 years agoIn very specific circumstances we can bulkDistribute 0 notices
Mikael Nordfeldth [Sat, 16 Jan 2016 16:18:14 +0000 (17:18 +0100)]
In very specific circumstances we can bulkDistribute 0 notices

Seems to be what caused an infinite loop on quitter.es, or I guess so anyway.

2 years agobulkDistribute won't add empty lists to database
Mikael Nordfeldth [Sat, 16 Jan 2016 16:34:27 +0000 (17:34 +0100)]
bulkDistribute won't add empty lists to database

2 years agoInitial user doesn't need as strict checking on email
Mikael Nordfeldth [Sat, 16 Jan 2016 16:20:26 +0000 (17:20 +0100)]
Initial user doesn't need as strict checking on email

2 years agoMerge branch 'master' of git.gnu.io:gnu/gnu-social
Mikael Nordfeldth [Sat, 16 Jan 2016 23:40:14 +0000 (00:40 +0100)]
Merge branch 'master' of git.gnu.io:gnu/gnu-social

2 years agoInitial user doesn't need as strict checking on email
Mikael Nordfeldth [Sat, 16 Jan 2016 16:20:26 +0000 (17:20 +0100)]
Initial user doesn't need as strict checking on email

2 years agoMerge branch 'fix_readme' into 'master'
mmn [Thu, 14 Jan 2016 12:03:11 +0000 (12:03 +0000)]
Merge branch 'fix_readme' into 'master'

update readme for OpportunisticQM: array need to contain key/value pairs

according to the doc-block of addPlugin() the array should contain key/value pairs, see https://git.gnu.io/gnu/gnu-social/blob/master/lib/gnusocial.php#L46

I updated the readme for the OpportunisticQM plugin to reflect this.

See merge request !81

2 years agoarray need to contain key/value pairs
Björn Schießle [Thu, 14 Jan 2016 11:39:39 +0000 (12:39 +0100)]
array need to contain key/value pairs

2 years agoMerge remote-tracking branch 'upstream/master'
Roland Haeder [Wed, 13 Jan 2016 15:58:08 +0000 (16:58 +0100)]
Merge remote-tracking branch 'upstream/master'

Preserved some type-hints

Signed-off-by: Roland Haeder <roland@mxchange.org>
2 years agoNot only local groups should be added to group inbox notificiation table
Mikael Nordfeldth [Sat, 9 Jan 2016 14:14:38 +0000 (15:14 +0100)]
Not only local groups should be added to group inbox notificiation table

2 years agoGet group attentions too for outbound notices
Mikael Nordfeldth [Sat, 9 Jan 2016 14:06:44 +0000 (15:06 +0100)]
Get group attentions too for outbound notices

2 years agoDo proper fromUri lookup on groups too
Mikael Nordfeldth [Sat, 9 Jan 2016 13:36:47 +0000 (14:36 +0100)]
Do proper fromUri lookup on groups too

2 years agoCancelGroupForm gets same typing as Join and Leave
Mikael Nordfeldth [Sat, 9 Jan 2016 13:13:19 +0000 (14:13 +0100)]
CancelGroupForm gets same typing as Join and Leave

2 years agoIssue #121 - use correct Group ID and strict User_group typing
Mikael Nordfeldth [Sat, 9 Jan 2016 13:06:31 +0000 (14:06 +0100)]
Issue #121 - use correct Group ID and strict User_group typing

2 years agoLocal user profile getUrl gives dynamically generated URL
Mikael Nordfeldth [Sat, 9 Jan 2016 12:47:38 +0000 (13:47 +0100)]
Local user profile getUrl gives dynamically generated URL

2 years agoActually return the group home URL
Mikael Nordfeldth [Sat, 9 Jan 2016 12:33:30 +0000 (13:33 +0100)]
Actually return the group home URL

2 years agoWups, $poster could be undefined
Mikael Nordfeldth [Sat, 9 Jan 2016 12:15:09 +0000 (13:15 +0100)]
Wups, $poster could be undefined

2 years agoAttention goes to the parent notice author too
Mikael Nordfeldth [Fri, 8 Jan 2016 01:58:31 +0000 (02:58 +0100)]
Attention goes to the parent notice author too

2 years agoSave attentions to Reply table for backwards compatibility
Mikael Nordfeldth [Fri, 8 Jan 2016 00:59:16 +0000 (01:59 +0100)]
Save attentions to Reply table for backwards compatibility

local users only of course

2 years agoAdd more info in logging call
Mikael Nordfeldth [Fri, 8 Jan 2016 00:52:10 +0000 (01:52 +0100)]
Add more info in logging call

There shouldn't be *HandleSalmonTarget, only verification of actor and
then Notice::saveActivity()!

2 years agoOStatus queue handler uses Notice->getAttentionProfiles()
Mikael Nordfeldth [Fri, 8 Jan 2016 00:31:47 +0000 (01:31 +0100)]
OStatus queue handler uses Notice->getAttentionProfiles()

and lots more debugging for LOG_DEBUG

2 years agoDefault to not include delete verbs in notice streams
Mikael Nordfeldth [Thu, 7 Jan 2016 22:33:47 +0000 (23:33 +0100)]
Default to not include delete verbs in notice streams

2 years agoNotice from web now saves context->attention too! ;)
Mikael Nordfeldth [Thu, 7 Jan 2016 22:24:15 +0000 (23:24 +0100)]
Notice from web now saves context->attention too! ;)

2 years agosaveAttentions, trying to move away from saveReply
Mikael Nordfeldth [Thu, 7 Jan 2016 22:23:51 +0000 (23:23 +0100)]
saveAttentions, trying to move away from saveReply

2 years agocommon_find_attentions to populate activities from content text
Mikael Nordfeldth [Thu, 7 Jan 2016 22:23:37 +0000 (23:23 +0100)]
common_find_attentions to populate activities from content text

2 years agoDon't store the notice object for distrib queue handler, just id
Mikael Nordfeldth [Thu, 7 Jan 2016 19:24:59 +0000 (20:24 +0100)]
Don't store the notice object for distrib queue handler, just id

2 years agoBeforePluginCheckSchema event for checkschema.php
Mikael Nordfeldth [Thu, 7 Jan 2016 17:45:36 +0000 (18:45 +0100)]
BeforePluginCheckSchema event for checkschema.php

2 years agoshortenLinks _after_ media upload to be consistent with api
Mikael Nordfeldth [Thu, 7 Jan 2016 17:14:45 +0000 (18:14 +0100)]
shortenLinks _after_ media upload to be consistent with api

2 years agoUse index for File url (urlhash)
Mikael Nordfeldth [Thu, 7 Jan 2016 17:13:10 +0000 (18:13 +0100)]
Use index for File url (urlhash)

2 years agoshortenLinks with a capital L
Mikael Nordfeldth [Thu, 7 Jan 2016 17:12:29 +0000 (18:12 +0100)]
shortenLinks with a capital L

2 years ago think I have managed to show oEmbed images better now
Mikael Nordfeldth [Thu, 7 Jan 2016 16:35:37 +0000 (17:35 +0100)]
 think I have managed to show oEmbed images better now

2 years agoFixed group representation in Directory plugin, also some ->raw calls
Mikael Nordfeldth [Thu, 7 Jan 2016 11:58:14 +0000 (12:58 +0100)]
Fixed group representation in Directory plugin, also some ->raw calls

2 years agoReturn Profile objects from getGroups in GroupdirectoryAction
Mikael Nordfeldth [Thu, 7 Jan 2016 11:35:52 +0000 (12:35 +0100)]
Return Profile objects from getGroups in GroupdirectoryAction

2 years agoAppropriate exception message in GroupNoProfileException
Mikael Nordfeldth [Thu, 7 Jan 2016 11:14:48 +0000 (12:14 +0100)]
Appropriate exception message in GroupNoProfileException

2 years agoDefine User_group::$profile_id among class variables
Mikael Nordfeldth [Thu, 7 Jan 2016 11:12:27 +0000 (12:12 +0100)]
Define User_group::$profile_id among class variables

2 years agoMax execution time margin for OpportunisticQM
Mikael Nordfeldth [Thu, 7 Jan 2016 10:58:09 +0000 (11:58 +0100)]
Max execution time margin for OpportunisticQM

I guess it could continue a bit too long in case it got a really long
(failing, timeouting) HTTP request just before max_execution_time hit.

2 years agoIndex the verb column since we do COUNT(*) based on it
Mikael Nordfeldth [Thu, 7 Jan 2016 10:39:46 +0000 (11:39 +0100)]
Index the verb column since we do COUNT(*) based on it

2 years agoConversation entries where id==0 would screw up the "re-auto-increment" sequencing
Mikael Nordfeldth [Wed, 6 Jan 2016 21:26:17 +0000 (22:26 +0100)]
Conversation entries where id==0 would screw up the "re-auto-increment" sequencing

2 years agoGah and a 302 in the non-exception-handling redirect too
Mikael Nordfeldth [Wed, 6 Jan 2016 19:09:59 +0000 (20:09 +0100)]
Gah and a 302 in the non-exception-handling redirect too

2 years agoAttachment thumbnail redirect is a 302 redirect
Mikael Nordfeldth [Wed, 6 Jan 2016 19:07:40 +0000 (20:07 +0100)]
Attachment thumbnail redirect is a 302 redirect

It SHOULD be cached but it might no longer be valid if we empty cache or something.

2 years agoOur URLs are permanent redirects, mind you!
Mikael Nordfeldth [Wed, 6 Jan 2016 19:06:14 +0000 (20:06 +0100)]
Our URLs are permanent redirects, mind you!

2 years agoBreaking class definitions out into separate files and fixing typing
Mikael Nordfeldth [Wed, 6 Jan 2016 18:46:56 +0000 (19:46 +0100)]
Breaking class definitions out into separate files and fixing typing

2 years agoDon't update stored URLs just because we have a filename
Mikael Nordfeldth [Wed, 6 Jan 2016 18:23:38 +0000 (19:23 +0100)]
Don't update stored URLs just because we have a filename

This would overwrite remote URLs with local verisons which removes source href...
The reason one might have filenames for remote URLs is that StoreRemoteMedia plugin
fetches them and uses the filename field.

2 years agoReturn dynamically generated URLs for thumbnails for all locally stored entries
Mikael Nordfeldth [Wed, 6 Jan 2016 18:06:29 +0000 (19:06 +0100)]
Return dynamically generated URLs for thumbnails for all locally stored entries

2 years agoAlways generate notice URLs on the fly for local notices
Mikael Nordfeldth [Wed, 6 Jan 2016 15:24:33 +0000 (16:24 +0100)]
Always generate notice URLs on the fly for local notices

Related to issue #118

2 years agoIssue #118 wanted better TOR support, now Avatar URLs are not stored
Mikael Nordfeldth [Wed, 6 Jan 2016 15:14:26 +0000 (16:14 +0100)]
Issue #118 wanted better TOR support, now Avatar URLs are not stored

There was no reason to store the generated Avatar URLs because it's so
cheap to generate them on the fly.

2 years agoNote in the debug log if we render the HTML of a message
Mikael Nordfeldth [Wed, 6 Jan 2016 14:37:30 +0000 (15:37 +0100)]
Note in the debug log if we render the HTML of a message

2 years agoAvoid having to check for notices without rendered copies in upgrade.php
Mikael Nordfeldth [Wed, 6 Jan 2016 14:32:00 +0000 (15:32 +0100)]
Avoid having to check for notices without rendered copies in upgrade.php

Always call the Notice->getRendered() function to get a rendered copy.
We could perhaps put some sanitation there too in the future

2 years agoGet conversation ID from child too in scripts/upgrade.php
Mikael Nordfeldth [Wed, 6 Jan 2016 13:57:30 +0000 (14:57 +0100)]
Get conversation ID from child too in scripts/upgrade.php

2 years agoSomewhat more meaningful error message
Mikael Nordfeldth [Wed, 6 Jan 2016 13:10:37 +0000 (14:10 +0100)]
Somewhat more meaningful error message

2 years agoConversation IDs (again) no longer based on Notice ID
Mikael Nordfeldth [Wed, 6 Jan 2016 12:58:46 +0000 (13:58 +0100)]
Conversation IDs (again) no longer based on Notice ID

2 years agoMore listitems and lists into separate files + stronger typing
Mikael Nordfeldth [Wed, 6 Jan 2016 00:36:46 +0000 (01:36 +0100)]
More listitems and lists into separate files + stronger typing

2 years agoSeparating classes into files and stronger typing
Mikael Nordfeldth [Wed, 6 Jan 2016 00:30:12 +0000 (01:30 +0100)]
Separating classes into files and stronger typing

2 years agoTyping to Profile
Mikael Nordfeldth [Wed, 6 Jan 2016 00:25:00 +0000 (01:25 +0100)]
Typing to Profile

2 years agoSubscriber lists to separate files and also Profile typing
Mikael Nordfeldth [Tue, 5 Jan 2016 23:57:31 +0000 (00:57 +0100)]
Subscriber lists to separate files and also Profile typing

2 years agoMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
Mikael Nordfeldth [Tue, 5 Jan 2016 23:53:20 +0000 (00:53 +0100)]
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes

2 years agoMerge branch 'nightly' into 'nightly'
mmn [Tue, 5 Jan 2016 23:53:08 +0000 (23:53 +0000)]
Merge branch 'nightly' into 'nightly'

only count post-notices (i.e. don't include activity-notices in statuses_count in the API)

See merge request !73

2 years agoMerge request #10 by aroque but in a slightly different version
Mikael Nordfeldth [Tue, 5 Jan 2016 23:48:03 +0000 (00:48 +0100)]
Merge request #10 by aroque but in a slightly different version

2 years ago$notices->verb = ActivityVerb::POST;
hannes [Tue, 5 Jan 2016 23:29:48 +0000 (23:29 +0000)]
$notices->verb = ActivityVerb::POST;

2 years agoMerge branch 'openid-plugin' into 'nightly'
mmn [Tue, 5 Jan 2016 23:28:28 +0000 (23:28 +0000)]
Merge branch 'openid-plugin' into 'nightly'

OpenID plugin: 'openid_only' should be 'openidonly'

To match everywhere else.

See merge request !72

2 years agoMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
Mikael Nordfeldth [Tue, 5 Jan 2016 23:24:41 +0000 (00:24 +0100)]
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes

2 years agoMerge branch 'lookup_url_fix' into 'nightly'
mmn [Tue, 5 Jan 2016 23:24:16 +0000 (23:24 +0000)]
Merge branch 'lookup_url_fix' into 'nightly'

makes url lookup work and adds full url to href for shortened links

See merge request !74

2 years agoRequire Profile for Profile->getLists
Mikael Nordfeldth [Tue, 5 Jan 2016 23:18:10 +0000 (00:18 +0100)]
Require Profile for Profile->getLists

2 years agolongurl in href
hannes [Tue, 5 Jan 2016 23:14:51 +0000 (23:14 +0000)]
longurl in href

2 years agoadd $redir->redir_url to use in common_linkify()
hannes [Tue, 5 Jan 2016 23:07:24 +0000 (23:07 +0000)]
add $redir->redir_url to use in common_linkify()

2 years agoRequire Profile for Profile->getOtherTags
Mikael Nordfeldth [Tue, 5 Jan 2016 22:07:30 +0000 (23:07 +0100)]
Require Profile for Profile->getOtherTags

2 years ago$longurl->url is just the same $canon we fed to File_redirection::where()
hannes [Tue, 5 Jan 2016 23:06:02 +0000 (23:06 +0000)]
$longurl->url is just the same $canon we fed to File_redirection::where()

2 years agoeffectiveUrl seems to contain the url we want
hannes [Tue, 5 Jan 2016 22:44:06 +0000 (22:44 +0000)]
effectiveUrl seems to contain the url we want

2 years agoDon't abort on too long notices in Notice::saveActivity
Mikael Nordfeldth [Tue, 5 Jan 2016 16:31:09 +0000 (17:31 +0100)]
Don't abort on too long notices in Notice::saveActivity

2 years agoonly count post-notices (i.e. don't include activity-notices in statuses_count in...
hannes [Tue, 5 Jan 2016 14:19:33 +0000 (14:19 +0000)]
only count post-notices (i.e. don't include activity-notices in statuses_count in the API)

2 years agoIf there's no Happening, we can't use the RSVP.
Mikael Nordfeldth [Tue, 5 Jan 2016 14:00:34 +0000 (15:00 +0100)]
If there's no Happening, we can't use the RSVP.

2 years agoprocessFeed would abort on certain errors where findLocalObject failed
Mikael Nordfeldth [Tue, 5 Jan 2016 14:00:07 +0000 (15:00 +0100)]
processFeed would abort on certain errors where findLocalObject failed

2 years agoXSS vulnerability when remote-subscribing
Mikael Nordfeldth [Tue, 5 Jan 2016 11:15:50 +0000 (12:15 +0100)]
XSS vulnerability when remote-subscribing

->raw was used on non-filtered strings for some reasons, changed
to ->text.

2 years agoProfileMiniList->newListItem changed to match ProfileList->newListItem
Mikael Nordfeldth [Mon, 4 Jan 2016 23:09:47 +0000 (00:09 +0100)]
ProfileMiniList->newListItem changed to match ProfileList->newListItem

2 years agoAllow Profile->getCurrentNotice to send scoped profile info
Mikael Nordfeldth [Mon, 4 Jan 2016 20:42:24 +0000 (21:42 +0100)]
Allow Profile->getCurrentNotice to send scoped profile info

not that we're using it anywhere (yet anyway).

2 years agoProfile->getCurrentNotice handles PrivateStreamException
Mikael Nordfeldth [Mon, 4 Jan 2016 20:38:41 +0000 (21:38 +0100)]
Profile->getCurrentNotice handles PrivateStreamException

2 years agoOpenID plugin: 'openid_only' should be 'openidonly'
Chimo [Mon, 4 Jan 2016 15:36:05 +0000 (10:36 -0500)]
OpenID plugin: 'openid_only' should be 'openidonly'

To match everywhere else.

2 years agoVersion bump since we've fixed a lot of bugs
Mikael Nordfeldth [Mon, 4 Jan 2016 01:19:37 +0000 (02:19 +0100)]
Version bump since we've fixed a lot of bugs

2 years agoWe would end up with a Managed_DataObject if now match was found
Mikael Nordfeldth [Mon, 4 Jan 2016 01:04:18 +0000 (02:04 +0100)]
We would end up with a Managed_DataObject if now match was found

meaning we'd return for example a Notice with empty id (translated into 0)
and thus Faves coming in from remote instances where the fave'd notice was
not found would result in faving the first Notice in a table-wide search,
i.e. often the first post on the instance.

Whoopie!

2 years agoCode cleanup in lib/activityutils.php
Mikael Nordfeldth [Mon, 4 Jan 2016 00:58:45 +0000 (01:58 +0100)]
Code cleanup in lib/activityutils.php

2 years agoMore explicit catch
Mikael Nordfeldth [Mon, 4 Jan 2016 00:53:33 +0000 (01:53 +0100)]
More explicit catch

2 years agoThe $options array isn't used here
Mikael Nordfeldth [Mon, 4 Jan 2016 00:48:54 +0000 (01:48 +0100)]
The $options array isn't used here

2 years agoUse EmptyIdException in Fave deletion try-catch
Mikael Nordfeldth [Sun, 3 Jan 2016 21:57:28 +0000 (22:57 +0100)]
Use EmptyIdException in Fave deletion try-catch

2 years agoEmptyIdException to make sure we get the right in catch
Mikael Nordfeldth [Sun, 3 Jan 2016 21:56:48 +0000 (22:56 +0100)]
EmptyIdException to make sure we get the right in catch

2 years agoFave deletion would fail in some cases with missing profiles or notices
Mikael Nordfeldth [Sun, 3 Jan 2016 21:35:49 +0000 (22:35 +0100)]
Fave deletion would fail in some cases with missing profiles or notices

2 years agoErr, forgot semicolon.
Mikael Nordfeldth [Sun, 3 Jan 2016 21:22:58 +0000 (22:22 +0100)]
Err, forgot semicolon.

2 years agoTry-catch on profile deletion unsubscribe actions
Mikael Nordfeldth [Sun, 3 Jan 2016 21:21:03 +0000 (22:21 +0100)]
Try-catch on profile deletion unsubscribe actions

2 years agoSomewhat better layout for approving/rejecting subrequests
Mikael Nordfeldth [Sun, 3 Jan 2016 19:42:21 +0000 (20:42 +0100)]
Somewhat better layout for approving/rejecting subrequests

2 years agoPending subscription requests now work as they should
Mikael Nordfeldth [Sun, 3 Jan 2016 19:27:53 +0000 (20:27 +0100)]
Pending subscription requests now work as they should

A slight layout issue with the buttons still persists

2 years agoIf a user has a private stream, assume a moderated subscription policy
Mikael Nordfeldth [Sun, 3 Jan 2016 18:33:26 +0000 (19:33 +0100)]
If a user has a private stream, assume a moderated subscription policy

2 years agoHandle private streams better (failed to show profile before)
Mikael Nordfeldth [Sun, 3 Jan 2016 18:05:49 +0000 (19:05 +0100)]
Handle private streams better (failed to show profile before)

2 years agoThis version of the EventPlugin won't work with StatusNet any longer
Mikael Nordfeldth [Sun, 3 Jan 2016 15:23:44 +0000 (16:23 +0100)]
This version of the EventPlugin won't work with StatusNet any longer

2 years agoMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
Mikael Nordfeldth [Sun, 3 Jan 2016 15:23:07 +0000 (16:23 +0100)]
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes

2 years agoMerge branch 'beautify_profile_list' into 'nightly'
mmn [Sun, 3 Jan 2016 15:22:32 +0000 (15:22 +0000)]
Merge branch 'beautify_profile_list' into 'nightly'

Beautify profiles and groups lists

Some css fixes to make groups and profiles list more consistent:

In base:

* Remove bullets that were floating around
* Reduce font size to fit and look better
* Group nickname is bold
* Same location and full name layout in both groups and profile lists

In neo-gnu:

* Align vertically location

In neo-quitter:

* Make group list look like profile one
* Small adjustments due to changes to base

How it looks with neo-gnu

Profile:

![profile](https://git.gnu.io/gnu/gnu-social/uploads/c403c85c323bdcaa2fbb7ab10539ad39/profile.png)

Groups:

![group](https://git.gnu.io/gnu/gnu-social/uploads/51276daa838c404bd63cc04b208beaa6/group.png)

How it looks with neo-quitter

Profile:

![profile](https://git.gnu.io/gnu/gnu-social/uploads/d16bc2587025769dac9e2b46a0589999/profile.png)

Group:

![group](https://git.gnu.io/gnu/gnu-social/uploads/125670c8bcf08bcabf2cac0e0bb0661b/group.png)

See merge request !26

2 years agoMerge branch 'nightly' into singpolyma/gnu-social-events-saveObjectFromActivity
Mikael Nordfeldth [Sun, 3 Jan 2016 12:08:34 +0000 (13:08 +0100)]
Merge branch 'nightly' into singpolyma/gnu-social-events-saveObjectFromActivity

Conflicts:
plugins/Event/EventPlugin.php
plugins/Event/classes/RSVP.php

I just fixed 'em with magic!