]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
8 years agoMerge remote-tracking branch 'upstream/master' into social-master
Roland Haeder [Tue, 5 Jan 2016 13:27:33 +0000 (14:27 +0100)]
Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 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.

8 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

8 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).

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

8 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

8 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!

8 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

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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

8 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)

8 years agoMerge remote-tracking branch 'upstream/master' into social-master
Roland Haeder [Sun, 3 Jan 2016 17:55:37 +0000 (18:55 +0100)]
Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 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

8 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

8 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

8 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!

8 years agoFixes issue #94 with undefined 'fr'
Mikael Nordfeldth [Sat, 2 Jan 2016 23:45:47 +0000 (00:45 +0100)]
Fixes issue #94 with undefined 'fr'

I just copied the English example...

8 years agoDon't store object type for verbs (as they don't have it)
Mikael Nordfeldth [Sat, 2 Jan 2016 15:05:20 +0000 (16:05 +0100)]
Don't store object type for verbs (as they don't have it)

8 years agoFix because qvitter supplies a twitter array value which is an array
Mikael Nordfeldth [Sat, 2 Jan 2016 01:01:54 +0000 (02:01 +0100)]
Fix because qvitter supplies a twitter array value which is an array

works for json API, not for XML, so we make an exception here...

8 years agoAvoid exception for invalid URL aborting rendering for parent notice if it fails
Mikael Nordfeldth [Fri, 1 Jan 2016 23:09:10 +0000 (00:09 +0100)]
Avoid exception for invalid URL aborting rendering for parent notice if it fails

8 years agoNewnoticeAction now uses Notice::saveActivity(...)
Mikael Nordfeldth [Fri, 1 Jan 2016 19:18:54 +0000 (20:18 +0100)]
NewnoticeAction now uses Notice::saveActivity(...)

8 years agoLocation::fromOptions(Notice::locationOptions(...))
Mikael Nordfeldth [Fri, 1 Jan 2016 18:29:31 +0000 (19:29 +0100)]
Location::fromOptions(Notice::locationOptions(...))

8 years agowhitespace switch for code layout
Mikael Nordfeldth [Fri, 1 Jan 2016 17:43:37 +0000 (18:43 +0100)]
whitespace switch for code layout

8 years agocommon_render_content doesn't require a Profile now
Mikael Nordfeldth [Fri, 1 Jan 2016 17:40:11 +0000 (18:40 +0100)]
common_render_content doesn't require a Profile now

8 years agoupgrade script makes sure all notices have rendered copies
Mikael Nordfeldth [Fri, 1 Jan 2016 17:29:44 +0000 (18:29 +0100)]
upgrade script makes sure all notices have rendered copies

8 years ago->getID() instead of ->id
Mikael Nordfeldth [Fri, 1 Jan 2016 17:21:54 +0000 (18:21 +0100)]
->getID() instead of ->id

8 years agoDon't require a notice object to common_linkify_mentions
Mikael Nordfeldth [Fri, 1 Jan 2016 17:20:42 +0000 (18:20 +0100)]
Don't require a notice object to common_linkify_mentions

8 years agoOutput fixed sizes of thumbnails so we don't get jumpy scrolling
Mikael Nordfeldth [Fri, 1 Jan 2016 13:13:16 +0000 (14:13 +0100)]
Output fixed sizes of thumbnails so we don't get jumpy scrolling

8 years agoRSVPs refer to Happening (event) by URI instead of ID now
Mikael Nordfeldth [Thu, 31 Dec 2015 18:23:05 +0000 (19:23 +0100)]
RSVPs refer to Happening (event) by URI instead of ID now

8 years agominor happening changes
Mikael Nordfeldth [Thu, 31 Dec 2015 17:04:12 +0000 (18:04 +0100)]
minor happening changes

8 years agoHandle feed imports with exceptions better
Mikael Nordfeldth [Thu, 31 Dec 2015 14:05:35 +0000 (15:05 +0100)]
Handle feed imports with exceptions better

8 years agos/LOG_ERROR/LOG_ERR/
Mikael Nordfeldth [Thu, 31 Dec 2015 12:04:50 +0000 (13:04 +0100)]
s/LOG_ERROR/LOG_ERR/

8 years agoLogging destinations and unnecessary debug
Mikael Nordfeldth [Thu, 31 Dec 2015 12:00:20 +0000 (13:00 +0100)]
Logging destinations and unnecessary debug

8 years agoException throwing and proper db retrieval
Mikael Nordfeldth [Thu, 31 Dec 2015 11:41:30 +0000 (12:41 +0100)]
Exception throwing and proper db retrieval

ActivityModeration plugin and its Deleted_notice class.

8 years agoProper error message in exception
Mikael Nordfeldth [Thu, 31 Dec 2015 11:41:02 +0000 (12:41 +0100)]
Proper error message in exception

8 years agoDeleted_notice had a superfluous field
Mikael Nordfeldth [Thu, 31 Dec 2015 11:33:59 +0000 (12:33 +0100)]
Deleted_notice had a superfluous field

8 years agoWups, $notice not $stored in the old function...
Mikael Nordfeldth [Thu, 31 Dec 2015 01:37:42 +0000 (02:37 +0100)]
Wups, $notice not $stored in the old function...

8 years agoNotice conversation is perhaps not set yet
Mikael Nordfeldth [Thu, 31 Dec 2015 01:35:13 +0000 (02:35 +0100)]
Notice conversation is perhaps not set yet

8 years agoDon't do saveKnownReplies unless it's a verb=post
Mikael Nordfeldth [Thu, 31 Dec 2015 01:31:35 +0000 (02:31 +0100)]
Don't do saveKnownReplies unless it's a verb=post

8 years agoUse recently implemented functions in saveKnownReplies
Mikael Nordfeldth [Thu, 31 Dec 2015 01:22:49 +0000 (02:22 +0100)]
Use recently implemented functions in saveKnownReplies

8 years agoOnly provide Notice oEmbed data for local notices
Mikael Nordfeldth [Thu, 31 Dec 2015 00:55:18 +0000 (01:55 +0100)]
Only provide Notice oEmbed data for local notices

8 years agolocal/* is already in root .gitignore
Mikael Nordfeldth [Thu, 31 Dec 2015 00:54:34 +0000 (01:54 +0100)]
local/* is already in root .gitignore

8 years agoissue #93
Mikael Nordfeldth [Wed, 30 Dec 2015 17:03:45 +0000 (18:03 +0100)]
issue #93

8 years agoRecoverpasswordAction uses User->setPassword()
Mikael Nordfeldth [Wed, 30 Dec 2015 16:53:43 +0000 (17:53 +0100)]
RecoverpasswordAction uses User->setPassword()

8 years agosetPassword now runs validate too
Mikael Nordfeldth [Wed, 30 Dec 2015 16:49:13 +0000 (17:49 +0100)]
setPassword now runs validate too

8 years agoAdded User->setPassword($password)
Mikael Nordfeldth [Wed, 30 Dec 2015 16:44:24 +0000 (17:44 +0100)]
Added User->setPassword($password)

8 years agoNotification mails are sent again fixes ssue #99
Mikael Nordfeldth [Wed, 30 Dec 2015 16:35:47 +0000 (17:35 +0100)]
Notification mails are sent again fixes ssue #99

The problem was that the ActivityVerbPostPlugin handled 'post' verbs
but didn't handle the notifications for them, so now we're returning
true in the event so the default behaviour (sending to 'getReplies'
recipients) is done by default.

8 years agoMerge branch 'nightly' into 'nightly'
mmn [Wed, 30 Dec 2015 15:38:19 +0000 (15:38 +0000)]
Merge branch 'nightly' into 'nightly'

fixes this issue: https://quitter.se/notice/4344600

See merge request !71

8 years agofixes this issue: https://quitter.se/notice/4344600
hannes [Wed, 30 Dec 2015 01:54:48 +0000 (01:54 +0000)]
fixes this issue: https://quitter.se/notice/4344600

8 years agocreate storage directories automatically
Mikael Nordfeldth [Sun, 27 Dec 2015 23:35:02 +0000 (00:35 +0100)]
create storage directories automatically

8 years agoGNU social config paths, removed StatusNet/Laconica
Mikael Nordfeldth [Sun, 27 Dec 2015 23:09:06 +0000 (00:09 +0100)]
GNU social config paths, removed StatusNet/Laconica

8 years agobackground folder has never been used for GNU social
Mikael Nordfeldth [Sun, 27 Dec 2015 23:00:04 +0000 (00:00 +0100)]
background folder has never been used for GNU social

8 years agominor tuning to nginx example config
Mikael Nordfeldth [Sun, 27 Dec 2015 22:58:10 +0000 (23:58 +0100)]
minor tuning to nginx example config

for example we really do wish to force people to use HTTPS ;)

8 years agoFile_redirection should get URLs properly
Mikael Nordfeldth [Sun, 27 Dec 2015 20:36:23 +0000 (21:36 +0100)]
File_redirection should get URLs properly

8 years agosplit() is deprecated and should be explode()
Mikael Nordfeldth [Sun, 27 Dec 2015 14:22:16 +0000 (15:22 +0100)]
split() is deprecated and should be explode()

We don't need the regexpness anyway.

8 years agoConfirm_address field address_extra _can_ be NULL
Mikael Nordfeldth [Sun, 27 Dec 2015 14:01:28 +0000 (15:01 +0100)]
Confirm_address field address_extra _can_ be NULL

8 years agoGroup membership URI needs dataobjects not IDs
Mikael Nordfeldth [Sun, 27 Dec 2015 12:01:24 +0000 (13:01 +0100)]
Group membership URI needs dataobjects not IDs

8 years agoFile_oembed varchar to text changes
Mikael Nordfeldth [Sun, 27 Dec 2015 11:11:29 +0000 (12:11 +0100)]
File_oembed varchar to text changes

No need to have text length limitations in the database for fields which
very well may be longer than what was previously set.

8 years agovarchar to text since there's no reason to limit the fields
Mikael Nordfeldth [Sun, 27 Dec 2015 10:50:11 +0000 (11:50 +0100)]
varchar to text since there's no reason to limit the fields

They caused problems when quitter.se was upgrading because someone was
named ryanjjjjjjjjjjjjjjjjjjj[and more than 191 'j's] etc.

8 years agoClarify that notices are also deleted with nukefile.php
Mikael Nordfeldth [Sun, 27 Dec 2015 10:43:25 +0000 (11:43 +0100)]
Clarify that notices are also deleted with nukefile.php

8 years agoReport if the email was not sent!
Mikael Nordfeldth [Sun, 27 Dec 2015 01:16:12 +0000 (02:16 +0100)]
Report if the email was not sent!

8 years agoServer exceptions should reasonably be 5xx
Mikael Nordfeldth [Sun, 27 Dec 2015 01:15:37 +0000 (02:15 +0100)]
Server exceptions should reasonably be 5xx

8 years agosyntax error
Mikael Nordfeldth [Sun, 27 Dec 2015 00:42:03 +0000 (01:42 +0100)]
syntax error

8 years agoDuplicate URI means we have it already, I assume
Mikael Nordfeldth [Sun, 27 Dec 2015 00:40:00 +0000 (01:40 +0100)]
Duplicate URI means we have it already, I assume

8 years agoHandle lack of parent nicely
Mikael Nordfeldth [Sat, 26 Dec 2015 15:36:03 +0000 (16:36 +0100)]
Handle lack of parent nicely

8 years agoLogging fixes
Mikael Nordfeldth [Sat, 26 Dec 2015 15:27:06 +0000 (16:27 +0100)]
Logging fixes

8 years agoMerge branch 'rm-design-config-doc' into 'nightly'
mmn [Wed, 23 Dec 2015 21:04:25 +0000 (21:04 +0000)]
Merge branch 'rm-design-config-doc' into 'nightly'

Remove $config['design'] documentation

I believe those options are gone since
36d619480a8f5fa06db5b54fe7686de83d8225be

Ref. #109

See merge request !70

8 years agoMerge branch 'autocomplete-group' into 'nightly'
mmn [Wed, 23 Dec 2015 21:04:18 +0000 (21:04 +0000)]
Merge branch 'autocomplete-group' into 'nightly'

Autocomplete group

Group autocompletion wasn't working for a couple of reasons:

1. $profile wasn't set (d8092207c0)
2. Profile::getUri() wasn't working for Groups, causing Profile::getAcctUri() to throw a ProfileNoAcctUriException (3e830dad374)

See merge request !68

8 years agoMerge branch 'profile-prefs-getall' into 'nightly'
mmn [Wed, 23 Dec 2015 21:03:55 +0000 (21:03 +0000)]
Merge branch 'profile-prefs-getall' into 'nightly'

Fixup Profile_prefs::getAll()

Ref. #98

See merge request !69

8 years agoRemove $config['design'] documentation
Chimo [Mon, 21 Dec 2015 17:53:30 +0000 (17:53 +0000)]
Remove $config['design'] documentation

I believe those options are gone since
36d619480a8f5fa06db5b54fe7686de83d8225be

8 years agoMerge remote-tracking branch 'upstream/master' into social-master
Roland Haeder [Fri, 18 Dec 2015 20:55:25 +0000 (21:55 +0100)]
Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
8 years agoProfile_prefs::getAll fix prefs loop
Chimo [Thu, 17 Dec 2015 14:58:06 +0000 (14:58 +0000)]
Profile_prefs::getAll fix prefs loop

DataObject::fetch doesn't return an object.

8 years agoProfile_prefs::getAll fix call to listFind
Chimo [Thu, 17 Dec 2015 14:55:39 +0000 (14:55 +0000)]
Profile_prefs::getAll fix call to listFind

2nd argument needs to be an array

8 years agoMake Profile::getUri work with Groups
Chimo [Wed, 16 Dec 2015 02:49:42 +0000 (21:49 -0500)]
Make Profile::getUri work with Groups

and by extension Profile::getAcctUri

8 years agoAutocomplete: Fix $profile being null for groups
Chimo [Wed, 16 Dec 2015 02:48:18 +0000 (21:48 -0500)]
Autocomplete: Fix $profile being null for groups

8 years agoMerge branch 'mmn_fixes' into nightly
Mikael Nordfeldth [Tue, 15 Dec 2015 11:34:12 +0000 (12:34 +0100)]
Merge branch 'mmn_fixes' into nightly

8 years ago$url should've been $file->getUrl()
Mikael Nordfeldth [Tue, 15 Dec 2015 11:30:35 +0000 (12:30 +0100)]
$url should've been $file->getUrl()

8 years agoDon't check Link header if not set
Mikael Nordfeldth [Tue, 15 Dec 2015 10:51:16 +0000 (11:51 +0100)]
Don't check Link header if not set

8 years agoBetter checks for defined array indexes
Mikael Nordfeldth [Tue, 15 Dec 2015 10:50:57 +0000 (11:50 +0100)]
Better checks for defined array indexes

8 years agoMerge branch 'master' into nightly
Mikael Nordfeldth [Mon, 14 Dec 2015 21:11:26 +0000 (22:11 +0100)]
Merge branch 'master' into nightly

8 years agoMerge branch 'send-twitter-replies-to-twitter' into 'master'
mmn [Mon, 14 Dec 2015 21:10:57 +0000 (21:10 +0000)]
Merge branch 'send-twitter-replies-to-twitter' into 'master'

Always send Twitter replies to Twitter

If is_twitter_notice($notice->reply_to) then send it to Twitter, even
if twitter import is off.  It's a reply to a Twitter notice, it should
go there!

(Also retweets.)

See merge request !42

8 years agoMerge branch 'direct-feed-sub' into 'master'
mmn [Mon, 14 Dec 2015 21:09:56 +0000 (21:09 +0000)]
Merge branch 'direct-feed-sub' into 'master'

If we are given a direct URL to a feed, use that

See merge request !54

8 years agoMerge branch 'twitter-show-rel-syndication' into 'master'
mmn [Mon, 14 Dec 2015 21:09:08 +0000 (21:09 +0000)]
Merge branch 'twitter-show-rel-syndication' into 'master'

Include rel-syndication link for tweets

As per: <http://microformats.org/wiki/rel-syndication>
This allows some services to find a post in Twitter.

See merge request !44

8 years agoMerge branch 'firefox-sub-link' into 'master'
mmn [Mon, 14 Dec 2015 21:08:22 +0000 (21:08 +0000)]
Merge branch 'firefox-sub-link' into 'master'

Link to add to Firefox as feedreader

This allows easily subscribing to any feed firefox detects in your GNU Social instance.

See merge request !55

8 years agoMerge branch 'fix-twitter-uri' into 'master'
mmn [Mon, 14 Dec 2015 21:07:48 +0000 (21:07 +0000)]
Merge branch 'fix-twitter-uri' into 'master'

Twitter URIs have changed

The #! was deprecated ages ago, and Twitter forces HTTPS these days.

See merge request !43

8 years agoMerge branch 'master' into nightly
Mikael Nordfeldth [Mon, 14 Dec 2015 21:07:06 +0000 (22:07 +0100)]
Merge branch 'master' into nightly

8 years agoMerge branch 'inbound-linkback' into 'master'
mmn [Mon, 14 Dec 2015 21:05:25 +0000 (21:05 +0000)]
Merge branch 'inbound-linkback' into 'master'

Accept mentions/replies/rsvps/likes via pingback and webmention

This makes the Linkback plugin bidirectional, allowing reply/mention federation between GNU Social and any pingback-enabled service (including any Wordpress site).

See merge request !41

8 years agoMerge branch 'twitter-check-dupe-by-uri' into 'master'
mmn [Mon, 14 Dec 2015 21:04:22 +0000 (21:04 +0000)]
Merge branch 'twitter-check-dupe-by-uri' into 'master'

TwitterBridge also check for dupe by uri

In case a twitter item came in from some other source (such as linkback).

See merge request !45

8 years agoMerge branch 'repost-of-uf2' into 'master'
mmn [Mon, 14 Dec 2015 21:03:38 +0000 (21:03 +0000)]
Merge branch 'repost-of-uf2' into 'master'

Mark up link to original as a repost for repeats

http://indiewebcamp.com/repost

See merge request !46

8 years agoMerge branch 'master' into nightly
Mikael Nordfeldth [Mon, 14 Dec 2015 21:03:04 +0000 (22:03 +0100)]
Merge branch 'master' into nightly

8 years agoMerge branch 'master' into mmn_fixes
Mikael Nordfeldth [Mon, 14 Dec 2015 21:01:50 +0000 (22:01 +0100)]
Merge branch 'master' into mmn_fixes

8 years agoMerge branch 'at-mention-url' into 'master'
mmn [Mon, 14 Dec 2015 21:01:42 +0000 (21:01 +0000)]
Merge branch 'at-mention-url' into 'master'

MentionURL Plugin

This plugin enables users to use the syntax `@twitter.com/singpolyma` to mention users the system does not know about, or to be more specific when a nickname is ambiguous.

See merge request !53