]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
10 years agoRemote profiles in AccountProfileBlock generated errors
Mikael Nordfeldth [Sat, 10 May 2014 00:33:36 +0000 (02:33 +0200)]
Remote profiles in AccountProfileBlock generated errors

10 years ago"Twitter card" support had badly referenced HTML outputter
Mikael Nordfeldth [Sat, 10 May 2014 00:01:58 +0000 (02:01 +0200)]
"Twitter card" support had badly referenced HTML outputter

10 years agoDirectory to default plugins (disabled for singleuser)
Mikael Nordfeldth [Fri, 9 May 2014 08:49:00 +0000 (10:49 +0200)]
Directory to default plugins (disabled for singleuser)

10 years agocurry.php can always be included (we use PHP>5.2)
Mikael Nordfeldth [Fri, 9 May 2014 08:46:46 +0000 (10:46 +0200)]
curry.php can always be included (we use PHP>5.2)

10 years agoTest against PHP_VERSION < 5.2.6, we don't support that low
Mikael Nordfeldth [Fri, 9 May 2014 08:36:22 +0000 (10:36 +0200)]
Test against PHP_VERSION < 5.2.6, we don't support that low

10 years agoOStatus enabled by default, only disabled for private siteprofile
Mikael Nordfeldth [Fri, 9 May 2014 08:31:55 +0000 (10:31 +0200)]
OStatus enabled by default, only disabled for private siteprofile

10 years agoLighttpd config example updated.
Mikael Nordfeldth [Fri, 9 May 2014 08:02:07 +0000 (10:02 +0200)]
Lighttpd config example updated.

10 years agosince_id and max_id for RawInboxNoticeStream
Mikael Nordfeldth [Wed, 7 May 2014 09:50:20 +0000 (11:50 +0200)]
since_id and max_id for RawInboxNoticeStream

Otherwise you could only fetch a strict limit since the latest notice.

10 years agoToo many bird wings ({), sorry Erkan :)
Mikael Nordfeldth [Wed, 7 May 2014 07:52:50 +0000 (09:52 +0200)]
Too many bird wings ({), sorry Erkan :)

10 years agowidth and height are now properties in the File class
Mikael Nordfeldth [Wed, 7 May 2014 07:51:37 +0000 (09:51 +0200)]
width and height are now properties in the File class

10 years agomisplaced dollar sign, also URLs != attention URIs
Mikael Nordfeldth [Wed, 7 May 2014 07:19:55 +0000 (09:19 +0200)]
misplaced dollar sign, also URLs != attention URIs

10 years agoOld examples of lacking 'new' before 'Exception'
Mikael Nordfeldth [Tue, 6 May 2014 22:06:16 +0000 (00:06 +0200)]
Old examples of lacking 'new' before 'Exception'

10 years agoForgot 'new' before the Exception class
Mikael Nordfeldth [Tue, 6 May 2014 22:06:04 +0000 (00:06 +0200)]
Forgot 'new' before the Exception class

10 years agoBad variable reference in OembedPlugin
Mikael Nordfeldth [Tue, 6 May 2014 21:43:02 +0000 (23:43 +0200)]
Bad variable reference in OembedPlugin

10 years agoBad variable reference in event hook.
Mikael Nordfeldth [Tue, 6 May 2014 21:40:45 +0000 (23:40 +0200)]
Bad variable reference in event hook.

10 years agoOpportunisticQM moved from core to default plugins.
Mikael Nordfeldth [Tue, 6 May 2014 21:32:32 +0000 (23:32 +0200)]
OpportunisticQM moved from core to default plugins.

This makes it easier to disable, but remember that you must then
either enable and maintain queue daemons or disable queueing (and
handle whatever remaining queue items are stored in the database)!

10 years agoMoved oEmbed stuff out to a plugin (Oembed).
Mikael Nordfeldth [Tue, 6 May 2014 21:00:30 +0000 (23:00 +0200)]
Moved oEmbed stuff out to a plugin (Oembed).

10 years agoEnable events for showing Attachment representation
Mikael Nordfeldth [Tue, 6 May 2014 19:49:42 +0000 (21:49 +0200)]
Enable events for showing Attachment representation

10 years agoGarbage collection script didn't loop through anything
Mikael Nordfeldth [Tue, 6 May 2014 14:18:47 +0000 (16:18 +0200)]
Garbage collection script didn't loop through anything

10 years agoUser object didn't have getNickname() function
Mikael Nordfeldth [Tue, 6 May 2014 14:08:36 +0000 (16:08 +0200)]
User object didn't have getNickname() function

We're just jumping on to the Profile->getNickname() function.

10 years agoMissed a $user->id to $profile->id translation
Mikael Nordfeldth [Tue, 6 May 2014 13:43:06 +0000 (15:43 +0200)]
Missed a $user->id to $profile->id translation

10 years agoMore Exceptions for FeedSub doSubscribe and related functions
Mikael Nordfeldth [Tue, 6 May 2014 13:40:57 +0000 (15:40 +0200)]
More Exceptions for FeedSub doSubscribe and related functions

Now also garbageCollect will now throw exceptions of failures of all kinds
and only reply true/false on entirely successful runs of sub/unsub.

10 years agoType testing instead of just empty() in OStatusPlugin
Mikael Nordfeldth [Tue, 6 May 2014 12:36:52 +0000 (14:36 +0200)]
Type testing instead of just empty() in OStatusPlugin

10 years agoVarious minor theme directory updates
Mikael Nordfeldth [Tue, 6 May 2014 12:08:58 +0000 (14:08 +0200)]
Various minor theme directory updates

10 years agoparent::handlePost() in CancelsubscriptionAction
Mikael Nordfeldth [Tue, 6 May 2014 11:26:30 +0000 (13:26 +0200)]
parent::handlePost() in CancelsubscriptionAction

10 years agoMagicEnvelope class now throws exception on XRD fail
Mikael Nordfeldth [Tue, 6 May 2014 09:33:06 +0000 (11:33 +0200)]
MagicEnvelope class now throws exception on XRD fail

10 years agoOnly run EndSubscribe when it is really a sub
Mikael Nordfeldth [Mon, 5 May 2014 22:22:02 +0000 (00:22 +0200)]
Only run EndSubscribe when it is really a sub

10 years agoShorter, cleaner, smarter CancelsubscriptionAction
Mikael Nordfeldth [Mon, 5 May 2014 21:58:55 +0000 (23:58 +0200)]
Shorter, cleaner, smarter CancelsubscriptionAction

10 years agoMore modern coding, stuff related to subscriptions
Mikael Nordfeldth [Mon, 5 May 2014 21:57:41 +0000 (23:57 +0200)]
More modern coding, stuff related to subscriptions

Also trying to use the newly implemented AlreadyFulfilledException

10 years agoAlreadyFulfilledException added, for acceptable exceptions
Mikael Nordfeldth [Mon, 5 May 2014 21:20:43 +0000 (23:20 +0200)]
AlreadyFulfilledException added, for acceptable exceptions

10 years agoMSN probably doesn't work, and we don't like it anyway
Mikael Nordfeldth [Mon, 5 May 2014 21:02:17 +0000 (23:02 +0200)]
MSN probably doesn't work, and we don't like it anyway

10 years agoCleaning up FavorAction
Mikael Nordfeldth [Mon, 5 May 2014 20:49:34 +0000 (22:49 +0200)]
Cleaning up FavorAction

10 years agoUsersalmonAction updated to stronger typing standards
Mikael Nordfeldth [Mon, 5 May 2014 17:37:37 +0000 (19:37 +0200)]
UsersalmonAction updated to stronger typing standards

10 years agoGroupsalmonAction updated to stronger typing standards
Mikael Nordfeldth [Mon, 5 May 2014 17:25:39 +0000 (19:25 +0200)]
GroupsalmonAction updated to stronger typing standards

10 years agoMore debugging for Salmon activities
Mikael Nordfeldth [Mon, 5 May 2014 17:10:44 +0000 (19:10 +0200)]
More debugging for Salmon activities

10 years agoStronger typing and function access control in OStatus
Mikael Nordfeldth [Mon, 5 May 2014 17:06:22 +0000 (19:06 +0200)]
Stronger typing and function access control in OStatus

10 years agoFunctions should return quickly (cosmetic)
Mikael Nordfeldth [Mon, 5 May 2014 17:05:05 +0000 (19:05 +0200)]
Functions should return quickly (cosmetic)

...rather than have long if statements encapsuling everything.

10 years agoSuccess debugging was too much noise
Mikael Nordfeldth [Mon, 5 May 2014 16:59:32 +0000 (18:59 +0200)]
Success debugging was too much noise

10 years agoUnsupportedMediaException caused excessive debug log
Mikael Nordfeldth [Mon, 5 May 2014 15:54:56 +0000 (17:54 +0200)]
UnsupportedMediaException caused excessive debug log

10 years agoMore debugging in Magicsig class verify method
Mikael Nordfeldth [Mon, 5 May 2014 15:48:21 +0000 (17:48 +0200)]
More debugging in Magicsig class verify method

10 years agoDeliver SMS to @-ref'd users who want it, regardless of subscription.
Joshua Judson Rosen [Sun, 12 Jan 2014 20:45:41 +0000 (15:45 -0500)]
Deliver SMS to @-ref'd users who want it, regardless of subscription.

10 years agoPrevent spurious refusals of legitimate notices posted to users via Salmon.
Joshua Judson Rosen [Wed, 30 Apr 2014 04:23:23 +0000 (00:23 -0400)]
Prevent spurious refusals of legitimate notices posted to users via Salmon.

Make the logic match the intent described in the comments.

The intent is clearly "accept notices whenever (A or B or C)", but
the logic implemented was more like "not ((not A) or (not B) or (not C))",
which is a basical boolean algebra fail (each of those ORs need to
become ANDs for double-negation to work).

The practical implication was that, for example, writing a reply
to someone else's notice and including an @-reference to _another_
user on another site to bring them into the discussion would
fail to deliver the notice to the new user because their server
would basically say `oh no, you can't message this user
from someone else's thread' because an earlier check for
the `A' or `C' parts of `(A or B or C)' prevents `B' from
being checked.

cf.: <http://status.hackerposse.com/notice/55846>, which was
refused by the nhcrossing.com server because it didn't know
about <http://sn.jonkman.ca/notice/93724>, even though it would
have passed the later `notice contains a reference to a local user'
check if not for an exception being prematurely thrown.

The whole idea of reporting `which specific check FAILED'
in an `if ANY SUCCEEDS' analysis is just bogus, so nix all of
the distinct ClientExceptions--a single `ALL FAILED' exception
is the only one that makes sense.

10 years agoMake stopdaemons.sh work with on multi-instance servers. So: - Allow specifying a...
Joshua Judson Rosen [Thu, 9 Aug 2012 03:41:02 +0000 (23:41 -0400)]
Make stopdaemons.sh work with on multi-instance servers. So: - Allow specifying a site on the command-line, just like startdaemons.sh. - If a site is specified, kill only its daemons--not all daemons with pid-files in the piddir.

10 years agoMake daemons call setgid() *before* setuid() because doing it the other way around...
Joshua Judson Rosen [Thu, 9 Aug 2012 03:17:51 +0000 (23:17 -0400)]
Make daemons call setgid() *before* setuid() because doing it the other way around doesn't appear to work, at least on Linux.

10 years agoAutocomplete: don't match non-subscribed group-names.
Joshua Judson Rosen [Wed, 30 Apr 2014 03:35:46 +0000 (23:35 -0400)]
Autocomplete: don't match non-subscribed group-names.

There's no point, since we can't post/link to them anyway.

10 years agoConversations now have URIs that are not URLs
Mikael Nordfeldth [Thu, 1 May 2014 13:47:51 +0000 (15:47 +0200)]
Conversations now have URIs that are not URLs

10 years agogetConversationUrl introduced for linking to conversations
Mikael Nordfeldth [Thu, 1 May 2014 13:25:19 +0000 (15:25 +0200)]
getConversationUrl introduced for linking to conversations

10 years agoLink notice posted time to local representation
Mikael Nordfeldth [Thu, 1 May 2014 12:28:18 +0000 (14:28 +0200)]
Link notice posted time to local representation

Notice class got a 'getLocalUrl' function.

10 years agoInstaller database adjustments
Mikael Nordfeldth [Thu, 1 May 2014 00:47:56 +0000 (02:47 +0200)]
Installer database adjustments

We can't say we officially support PostgreSQL, unfortunately. There
are too many database calls with MySQL specific syntax. This would be
desirable for a 2.0 release, but too much work while maintaining 1.x.

The main difficulty is that we're using PEAR::DB which is aging. If
that's exchanged, maybe we could use PDO or something.

10 years agoWe're not interested in Disqus support.
Mikael Nordfeldth [Thu, 1 May 2014 00:15:10 +0000 (02:15 +0200)]
We're not interested in Disqus support.

10 years agoNotice URIs are not necessarily URLs.
Mikael Nordfeldth [Wed, 30 Apr 2014 18:44:23 +0000 (20:44 +0200)]
Notice URIs are not necessarily URLs.

Let's use getUrl() for URL retrieval. May throw exceptions, but
only if it's a Notice that cannot be linked like that anyway.

10 years agowtf is Echo? bah, let's get rid of this crap
Mikael Nordfeldth [Wed, 30 Apr 2014 18:35:06 +0000 (20:35 +0200)]
wtf is Echo? bah, let's get rid of this crap

10 years agoFix Direct Message functionality.
Mikael Nordfeldth [Tue, 29 Apr 2014 18:37:58 +0000 (20:37 +0200)]
Fix Direct Message functionality.

10 years agos/bestUrl/getUrl/ for notices and microapp objects
Mikael Nordfeldth [Tue, 29 Apr 2014 17:46:58 +0000 (19:46 +0200)]
s/bestUrl/getUrl/ for notices and microapp objects

10 years agoVideoThumbnails failure detection improved.
Mikael Nordfeldth [Tue, 29 Apr 2014 17:45:42 +0000 (19:45 +0200)]
VideoThumbnails failure detection improved.

10 years agoHandle File thumbnail errors better
Mikael Nordfeldth [Mon, 28 Apr 2014 18:26:32 +0000 (20:26 +0200)]
Handle File thumbnail errors better

10 years agoInlineAttachmentList had unnecessary function
Mikael Nordfeldth [Mon, 28 Apr 2014 18:12:00 +0000 (20:12 +0200)]
InlineAttachmentList had unnecessary function

10 years agoMinifying javascripts is evil. Let's not do it.
Mikael Nordfeldth [Mon, 28 Apr 2014 16:56:45 +0000 (18:56 +0200)]
Minifying javascripts is evil. Let's not do it.

The microformats stuff was unused

10 years agoDatetime representation aligned for microformats2
Mikael Nordfeldth [Mon, 28 Apr 2014 15:45:21 +0000 (17:45 +0200)]
Datetime representation aligned for microformats2

Read more at http://microformats.org/

Also, tooltip text on time representation for humans has been improved.
Unfortunately no standardised representation (like "RFC850") had 4-digit years.

10 years agoCode cleanup and enabling User object's etc. getUri()
Mikael Nordfeldth [Mon, 28 Apr 2014 12:08:42 +0000 (14:08 +0200)]
Code cleanup and enabling User object's etc. getUri()

10 years agogetUrl replaces deprecated bestUrl (more to come)
Mikael Nordfeldth [Mon, 28 Apr 2014 12:04:54 +0000 (14:04 +0200)]
getUrl replaces deprecated bestUrl (more to come)

10 years agoEmailAuthentication enabled by default
Mikael Nordfeldth [Mon, 28 Apr 2014 10:38:30 +0000 (12:38 +0200)]
EmailAuthentication enabled by default

The login field said "Username or email address" already, so...

10 years agoBetter fallback on UnsupportedMediaException
Mikael Nordfeldth [Mon, 28 Apr 2014 10:12:06 +0000 (12:12 +0200)]
Better fallback on UnsupportedMediaException

10 years agoFile width and height is now properly set for File
Mikael Nordfeldth [Tue, 22 Apr 2014 10:09:24 +0000 (12:09 +0200)]
File width and height is now properly set for File

10 years agoBe more precise in return array from image scaling
Mikael Nordfeldth [Mon, 21 Apr 2014 20:31:13 +0000 (22:31 +0200)]
Be more precise in return array from image scaling

10 years agoRedirect from Attachment_thumbnailAction
Mikael Nordfeldth [Mon, 21 Apr 2014 19:19:45 +0000 (21:19 +0200)]
Redirect from Attachment_thumbnailAction

Noone should trust an <img/> tag delivered like that anyway.

10 years agoDynamically generate thumbnails (see full text)
Mikael Nordfeldth [Mon, 21 Apr 2014 18:39:28 +0000 (20:39 +0200)]
Dynamically generate thumbnails (see full text)

The File object now stores width and height of files that can
supply this kind of information. Formats which we can not read
natively in PHP do not currently benefit from this. However an
event hook will be introduced later.

The CreateFileImageThumbnail event is renamed to:
CreateFileImageThumbnailSource to clarify that the hooks should not
generate their own thumbnails but only the source image. Also it now
accepts File objects, not MediaFile objects.

The thumbnail generation is documented in the source code. For
developers, call 'getThumbnail' on a File object and hope for the best.

Default thumbnail sizes have increased to be more appealing.

10 years agouse intval() instead of floor() for int return type
Mikael Nordfeldth [Mon, 21 Apr 2014 17:32:08 +0000 (19:32 +0200)]
use intval() instead of floor() for int return type

10 years agoAction->int(...) never replied with integers
Mikael Nordfeldth [Mon, 21 Apr 2014 12:31:18 +0000 (14:31 +0200)]
Action->int(...) never replied with integers

10 years agoBetter event name (creating thumbnail _source_)
Mikael Nordfeldth [Mon, 21 Apr 2014 10:33:41 +0000 (12:33 +0200)]
Better event name (creating thumbnail _source_)

10 years agoPreparing File for dynamic thumbnail generation.
Mikael Nordfeldth [Mon, 21 Apr 2014 09:35:42 +0000 (11:35 +0200)]
Preparing File for dynamic thumbnail generation.

10 years agoFile_oembed::saveNew are File::saveNew are static
Mikael Nordfeldth [Sun, 20 Apr 2014 14:06:41 +0000 (16:06 +0200)]
File_oembed::saveNew are File::saveNew are static

Also did some non-backwards-compatible (to StatusNet) code cleanup.

10 years agodeprecate Notice::bestUrl() in favor of getUrl()
Mikael Nordfeldth [Sat, 19 Apr 2014 20:24:40 +0000 (22:24 +0200)]
deprecate Notice::bestUrl() in favor of getUrl()

10 years agoMissing semi colon in showNotice class.
Mikael Nordfeldth [Sat, 19 Apr 2014 20:20:45 +0000 (22:20 +0200)]
Missing semi colon in showNotice class.

10 years agoOStatus onStartNoticeSourceLink to use exceptions
Mikael Nordfeldth [Sat, 19 Apr 2014 20:18:36 +0000 (22:18 +0200)]
OStatus onStartNoticeSourceLink to use exceptions

10 years agoImprove ShownoticeAction remote redirect code
Mikael Nordfeldth [Sat, 19 Apr 2014 20:13:48 +0000 (22:13 +0200)]
Improve ShownoticeAction remote redirect code

10 years agoUse getUrl() instead of ->url in OembedAction
Mikael Nordfeldth [Sat, 19 Apr 2014 20:05:44 +0000 (22:05 +0200)]
Use getUrl() instead of ->url in OembedAction

10 years agoFixes to URI/URL handling for notices
Mikael Nordfeldth [Fri, 18 Apr 2014 21:53:16 +0000 (23:53 +0200)]
Fixes to URI/URL handling for notices

10 years agoNo need for common_notice_uri anymore
Mikael Nordfeldth [Fri, 18 Apr 2014 21:36:07 +0000 (23:36 +0200)]
No need for common_notice_uri anymore

10 years agoHandle missing URIs and URLs better
Mikael Nordfeldth [Fri, 18 Apr 2014 21:36:01 +0000 (23:36 +0200)]
Handle missing URIs and URLs better

10 years agoAvoid double colon on Notice URI generation
Mikael Nordfeldth [Fri, 18 Apr 2014 21:17:34 +0000 (23:17 +0200)]
Avoid double colon on Notice URI generation

10 years agoThrow exception when we can't get the url for a notice
Mikael Nordfeldth [Fri, 18 Apr 2014 21:17:15 +0000 (23:17 +0200)]
Throw exception when we can't get the url for a notice

10 years agoFile_thumbnail lacked getUrl function
Mikael Nordfeldth [Fri, 18 Apr 2014 21:06:28 +0000 (23:06 +0200)]
File_thumbnail lacked getUrl function

The only reason it worked was because DB fetches calls to get$varname if
the dataobject has a variable with the specific name. However, it started
blurting out errors that the case must be correct (which would require
'geturl' to be the function name).

Since we probably want to replace DB sometime, we'll just override this
auto-fetching mechanism and use more explicitly defined functions.

10 years agoSet new notice uri to something that's not a URL
Mikael Nordfeldth [Fri, 18 Apr 2014 20:42:01 +0000 (22:42 +0200)]
Set new notice uri to something that's not a URL

10 years agoWe get profiles directly, there's no user object anymore
Mikael Nordfeldth [Fri, 18 Apr 2014 20:18:11 +0000 (22:18 +0200)]
We get profiles directly, there's no user object anymore

10 years agoThumbnails are not faded anymore (CSS opacity)
Mikael Nordfeldth [Fri, 18 Apr 2014 09:10:59 +0000 (11:10 +0200)]
Thumbnails are not faded anymore (CSS opacity)

10 years agoThumbnails are now by default squares of 150px
Mikael Nordfeldth [Fri, 18 Apr 2014 09:07:59 +0000 (11:07 +0200)]
Thumbnails are now by default squares of 150px

10 years agoEnable square thumbnailing
Mikael Nordfeldth [Fri, 18 Apr 2014 09:07:45 +0000 (11:07 +0200)]
Enable square thumbnailing

10 years agoThumbnail default set to 150px square
Mikael Nordfeldth [Thu, 17 Apr 2014 13:15:12 +0000 (15:15 +0200)]
Thumbnail default set to 150px square

10 years agoOriginal name preserved in uploaded file.
Mikael Nordfeldth [Wed, 16 Apr 2014 21:17:27 +0000 (23:17 +0200)]
Original name preserved in uploaded file.

Avoiding collisions with date (shorter than before) and 4 character
random alphanumeric string. I bet someone could mass-upload files
and generate all combinations of aaaa-zzzz during the course of a
day, but then maybe that user should be disabled anyway :)
(filling the collision space will cause a never-ending loop).

10 years agoBetter plugin description for VideoThumbnails
Mikael Nordfeldth [Wed, 16 Apr 2014 20:12:15 +0000 (22:12 +0200)]
Better plugin description for VideoThumbnails

10 years agoMediaFile thumbnail event hooks + VideoThumbnails plugin
Mikael Nordfeldth [Wed, 16 Apr 2014 17:14:26 +0000 (19:14 +0200)]
MediaFile thumbnail event hooks + VideoThumbnails plugin

The exception thrown from MediaFile will be caught and simply result in
no thumbnail at all right now. In the future we might use a catch-all
and have a "cannot generate preview"-icon or something.

VideoThumbnails requires php5-ffmpeg and php5-gd.

10 years agoImageFile unlink function referenced bad path
Mikael Nordfeldth [Wed, 16 Apr 2014 18:08:21 +0000 (20:08 +0200)]
ImageFile unlink function referenced bad path

10 years agoSome files got updated coding style
Mikael Nordfeldth [Tue, 15 Apr 2014 08:49:20 +0000 (10:49 +0200)]
Some files got updated coding style

Actions have $this->scoped as the current profile which we can gladly
replace all the $cur=common_current_user() with.

And we want the prepare/handle functions to be protected. Plus only
the prepare function uses $args (which _must_ be an array).

10 years agoHTML5 video/audio support in attachments
Mikael Nordfeldth [Mon, 14 Apr 2014 12:06:11 +0000 (14:06 +0200)]
HTML5 video/audio support in attachments

10 years agoAdded some free codecs for media attachments
Mikael Nordfeldth [Mon, 14 Apr 2014 11:47:42 +0000 (13:47 +0200)]
Added some free codecs for media attachments

10 years agoHTML5 required attribute for some input forms
Mikael Nordfeldth [Sun, 6 Apr 2014 09:27:41 +0000 (11:27 +0200)]
HTML5 required attribute for some input forms

10 years agoRemoved Daisychain folder, legacy stuff
Mikael Nordfeldth [Sun, 6 Apr 2014 09:26:12 +0000 (11:26 +0200)]
Removed Daisychain folder, legacy stuff

10 years agoMerge commit 'refs/merge-requests/199' of git://gitorious.org/statusnet/mainline...
Mikael Nordfeldth [Mon, 31 Mar 2014 11:09:11 +0000 (13:09 +0200)]
Merge commit 'refs/merge-requests/199' of git://gitorious.org/statusnet/mainline into statusnet-merge-requests/199

10 years agoMerge commit 'refs/merge-requests/12' of git://gitorious.org/statusnet/gnu-social...
Mikael Nordfeldth [Mon, 31 Mar 2014 10:36:55 +0000 (12:36 +0200)]
Merge commit 'refs/merge-requests/12' of git://gitorious.org/statusnet/gnu-social into merge-requests/12