]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
15 years agoinsert into user's inbox at Web time
Evan Prodromou [Thu, 23 Apr 2009 10:38:51 +0000 (10:38 +0000)]
insert into user's inbox at Web time

15 years ago8-char limit on transports
Evan Prodromou [Thu, 23 Apr 2009 10:09:08 +0000 (10:09 +0000)]
8-char limit on transports

15 years agoblow subs cache after updating inboxes
Evan Prodromou [Thu, 23 Apr 2009 10:08:51 +0000 (10:08 +0000)]
blow subs cache after updating inboxes

15 years agoalert to what transport we're checking for
Evan Prodromou [Thu, 23 Apr 2009 10:08:26 +0000 (10:08 +0000)]
alert to what transport we're checking for

15 years agosome basic fixes for inbox and memcached queue handlers
Evan Prodromou [Thu, 23 Apr 2009 09:52:21 +0000 (09:52 +0000)]
some basic fixes for inbox and memcached queue handlers

15 years agoincorrect config setting for inboxes
Evan Prodromou [Thu, 23 Apr 2009 09:35:10 +0000 (09:35 +0000)]
incorrect config setting for inboxes

15 years agoincorrect config setting for queues
Evan Prodromou [Thu, 23 Apr 2009 09:34:56 +0000 (09:34 +0000)]
incorrect config setting for queues

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Thu, 23 Apr 2009 09:24:13 +0000 (05:24 -0400)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agofix parse error in memcachedqueuehandler
Evan Prodromou [Thu, 23 Apr 2009 09:23:59 +0000 (05:23 -0400)]
fix parse error in memcachedqueuehandler

15 years agoAdd an inbox queue handler
Evan Prodromou [Thu, 23 Apr 2009 09:08:48 +0000 (05:08 -0400)]
Add an inbox queue handler

Handle distributing a notice to multiple inboxes in a queue handler
rather than in the Web action.

15 years agoA queuehandler for blowing caches offline
Evan Prodromou [Thu, 23 Apr 2009 09:03:19 +0000 (05:03 -0400)]
A queuehandler for blowing caches offline

We add a queuehandler for blowing the memcached caches off-line. This
should speed up the processing of new notices.

15 years agoAllowing XHR for Inbox/Outbox pages.
Sarven Capadisli [Thu, 23 Apr 2009 02:22:00 +0000 (02:22 +0000)]
Allowing XHR for Inbox/Outbox pages.

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Zach Copley [Thu, 23 Apr 2009 02:19:12 +0000 (02:19 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoAdded ajax responses
Zach Copley [Thu, 23 Apr 2009 02:17:58 +0000 (02:17 +0000)]
Added ajax responses

15 years agofix join a group link from user homepage when he hasn't posted anything yet
Robin Millette [Thu, 23 Apr 2009 01:03:17 +0000 (01:03 +0000)]
fix join a group link from user homepage when he hasn't posted anything yet

15 years agoSuppress errors when checking for the existence of files that might be restricted...
CiaranG [Tue, 21 Apr 2009 22:36:15 +0000 (23:36 +0100)]
Suppress errors when checking for the existence of files that might be restricted by open_basedir - should resolve issue #1310

15 years agoAdd feed2omb to notice sources
CiaranG [Tue, 21 Apr 2009 19:43:57 +0000 (20:43 +0100)]
Add feed2omb to notice sources

15 years agoMerge branch '0.7.x' of git://gitorious.org/laconica/mgrdcm-twitapibools into review...
Adrian Lang [Mon, 20 Apr 2009 11:09:05 +0000 (13:09 +0200)]
Merge branch '0.7.x' of git://gitorious.org/laconica/mgrdcm-twitapibools into review/master

15 years agoMerge branch '0.7.x' of git://gitorious.org/laconica/bAvatar-clone without the uninte...
Adrian Lang [Mon, 20 Apr 2009 10:15:12 +0000 (12:15 +0200)]
Merge branch '0.7.x' of git://gitorious.org/laconica/bAvatar-clone without the unintended deletion.

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Sun, 19 Apr 2009 02:36:41 +0000 (19:36 -0700)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoadd reply_to index to notice
Evan Prodromou [Sun, 19 Apr 2009 02:36:25 +0000 (19:36 -0700)]
add reply_to index to notice

15 years agoFixing spaces/tabs.
Dan Moore [Sat, 18 Apr 2009 19:54:23 +0000 (15:54 -0400)]
Fixing spaces/tabs.

15 years agoThis should change the JSON representation of the booleans 'following' and 'notificat...
Dan Moore [Sat, 18 Apr 2009 19:42:44 +0000 (15:42 -0400)]
This should change the JSON representation of the booleans 'following' and 'notifications', but unlike the previous change, I was unable to test this.

15 years agoBringing the presentation of boolean variables (favorited, truncated, profile_backgro...
Dan Moore [Sat, 18 Apr 2009 19:33:36 +0000 (15:33 -0400)]
Bringing the presentation of boolean variables (favorited, truncated, profile_background_tile) and the result from friendships/exist in JSON results from the Twitter Compatible API in line with what the real Twitter API does.

Currently, laconica returns text strings enclosed in quotes instead of bare Javascript booleans.  This change fixes that.

See http://laconi.ca/trac/ticket/1326 for one open issue related to this.

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Robin Millette [Sat, 18 Apr 2009 19:08:48 +0000 (19:08 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agotrac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds
Robin Millette [Sat, 18 Apr 2009 19:08:33 +0000 (19:08 +0000)]
trac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds

15 years agoshortening links in notices from XMPP
Tobias Diekershoff [Sat, 18 Apr 2009 17:00:20 +0000 (19:00 +0200)]
shortening links in notices from XMPP

This patch enables shortening of links, that where send from XMPP.
The problem was, that in util.php common_current_user() is not
finding the user account from which is posted, so the service to
shorten is not known, so no shortening at all...

This patch cleans up the xmppdaemon a little bit and hard codes ur1.ca
as shortening service _if_ the user is not set. Ugly but working.

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Fri, 17 Apr 2009 20:41:34 +0000 (13:41 -0700)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agocounter() after val() reset to avoid (weird) bug.
Sarven Capadisli [Fri, 17 Apr 2009 20:14:06 +0000 (20:14 +0000)]
counter() after val() reset to avoid (weird) bug.

15 years agoincorrect variable access
Evan Prodromou [Fri, 17 Apr 2009 20:03:33 +0000 (13:03 -0700)]
incorrect variable access

15 years agostore invite code in session so openidfinish can find it
Evan Prodromou [Fri, 17 Apr 2009 19:52:26 +0000 (12:52 -0700)]
store invite code in session so openidfinish can find it

15 years agoClear notice char counter for direct messages as well.
Sarven Capadisli [Fri, 17 Apr 2009 19:51:20 +0000 (19:51 +0000)]
Clear notice char counter for direct messages as well.

15 years agoFixed file that was removed by mistake.
Robin Millette [Fri, 17 Apr 2009 17:31:22 +0000 (17:31 +0000)]
Fixed file that was removed by mistake.

15 years agofile was removed by mistake.
Robin Millette [Fri, 17 Apr 2009 17:24:41 +0000 (17:24 +0000)]
file was removed by mistake.

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Robin Millette [Fri, 17 Apr 2009 16:47:18 +0000 (16:47 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agocosmetic fixes.
Robin Millette [Fri, 17 Apr 2009 16:46:49 +0000 (16:46 +0000)]
cosmetic fixes.

15 years agoTicket 1404. Showing the link to the members list page.
Sarven Capadisli [Fri, 17 Apr 2009 01:11:38 +0000 (01:11 +0000)]
Ticket 1404. Showing the link to the members list page.

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Sarven Capadisli [Thu, 16 Apr 2009 21:59:40 +0000 (21:59 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoform_notice textarea is cleared on successful direct message post.
Sarven Capadisli [Thu, 16 Apr 2009 21:57:42 +0000 (21:57 +0000)]
form_notice textarea is cleared on successful direct message post.

Disabled notice posting with XHR on Inbox and Outbox pages. This will
be revisited in 0.8.x.

15 years agoMake API dates more compatible with Twitter - ticket 1432
Zach Copley [Thu, 16 Apr 2009 21:40:57 +0000 (14:40 -0700)]
Make API dates more compatible with Twitter - ticket 1432

15 years agoAbort the xmpp-related daemons immediately if xmpp is disabled in the config, otherwi...
CiaranG [Thu, 16 Apr 2009 20:07:59 +0000 (21:07 +0100)]
Abort the xmpp-related daemons immediately if xmpp is disabled in the config, otherwise they chew up *lots* of CPU doing nothing

15 years agoAdd an even (hook): StartPersonalGroupNav.
Robin Millette [Thu, 16 Apr 2009 17:58:52 +0000 (17:58 +0000)]
Add an even (hook): StartPersonalGroupNav.

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Robin Millette [Thu, 16 Apr 2009 17:34:40 +0000 (17:34 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoAdd a few events (hooks): RegistrationTry, RegistrationForData, ProfileFormData and...
Robin Millette [Thu, 16 Apr 2009 17:34:19 +0000 (17:34 +0000)]
Add a few events (hooks): RegistrationTry, RegistrationForData, ProfileFormData and ProfileSaveForm.

15 years agoClarification in README regarding welcome/default users, as it has tripped a couple...
CiaranG [Thu, 16 Apr 2009 16:21:06 +0000 (17:21 +0100)]
Clarification in README regarding welcome/default users, as it has tripped a couple of people up

15 years agoMerge branch 'nobase' into 0.7.x
Evan Prodromou [Wed, 15 Apr 2009 15:31:57 +0000 (11:31 -0400)]
Merge branch 'nobase' into 0.7.x

15 years agoscript to trim very old notices from inboxes
Evan Prodromou [Wed, 15 Apr 2009 15:30:33 +0000 (11:30 -0400)]
script to trim very old notices from inboxes

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Wed, 15 Apr 2009 14:25:26 +0000 (10:25 -0400)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Conflicts:
actions/public.php

15 years agoadd user id to statistics
Evan Prodromou [Wed, 15 Apr 2009 14:05:16 +0000 (10:05 -0400)]
add user id to statistics

15 years agoAdd escaping of /.
Adrian Lang [Wed, 15 Apr 2009 11:29:52 +0000 (13:29 +0200)]
Add escaping of /.

15 years agoUse preg_quote to fix http://laconi.ca/trac/ticket/1342
Fil [Wed, 15 Apr 2009 08:35:15 +0000 (10:35 +0200)]
Use preg_quote to fix http://laconi.ca/trac/ticket/1342

15 years agoMerge branch 'link-rel-paginate' of git://gitorious.org/laconica/meitar. Fixed wrong...
Adrian Lang [Wed, 15 Apr 2009 07:38:19 +0000 (09:38 +0200)]
Merge branch 'link-rel-paginate' of git://gitorious.org/laconica/meitar. Fixed wrong call of common_local_url.

These changes add opera-readable prev/next relations.

15 years agoMake OMB work if the configured domain name does not exclusively contain lower case...
Adrian Lang [Wed, 15 Apr 2009 07:18:43 +0000 (09:18 +0200)]
Make OMB work if the configured domain name does not exclusively contain lower case letters.

If the configured domain is mixed-case OAuth throws invalidsignature errors. The current URL is part of the signated parts; since the consumer does not pass the current URL, the service has to get it itself and add it to the other OAuth params for signature rebuilding. OAuth.php uses $_SERVER for this, however, the domain is lcased in $_SERVER. Hence we pass the complete current URL as generated by common_local_url to OAuthRequest.

15 years agoAdd license notice to install.php, replace short and asp style tags by more portable...
Adrian Lang [Wed, 15 Apr 2009 06:38:05 +0000 (08:38 +0200)]
Add license notice to install.php, replace short and asp style tags by more portable long tag form.

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Robin Millette [Tue, 14 Apr 2009 23:03:31 +0000 (23:03 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agotrac#1223 Show most popular notices per tag in the tag page sidebar.
Robin Millette [Tue, 14 Apr 2009 23:03:19 +0000 (23:03 +0000)]
trac#1223 Show most popular notices per tag in the tag page sidebar.

15 years agoMake stuff work with no base
Evan Prodromou [Tue, 14 Apr 2009 20:02:09 +0000 (16:02 -0400)]
Make stuff work with no base

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Tue, 14 Apr 2009 20:01:22 +0000 (16:01 -0400)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoescape slash in regexp
Evan Prodromou [Tue, 14 Apr 2009 20:01:02 +0000 (16:01 -0400)]
escape slash in regexp

15 years agoNotice sources: Fixed Nambu, added Tricklepost and sorted the list.
Zach Copley [Tue, 14 Apr 2009 18:50:59 +0000 (11:50 -0700)]
Notice sources: Fixed Nambu, added Tricklepost and sorted the list.

15 years agoFix bad dates in API's JSON search results
Zach Copley [Mon, 13 Apr 2009 22:03:34 +0000 (15:03 -0700)]
Fix bad dates in API's JSON search results

15 years agotypo in lib action
Evan Prodromou [Mon, 13 Apr 2009 19:54:16 +0000 (15:54 -0400)]
typo in lib action

15 years agotypo in api.php
Evan Prodromou [Mon, 13 Apr 2009 19:52:15 +0000 (15:52 -0400)]
typo in api.php

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Mon, 13 Apr 2009 19:51:12 +0000 (15:51 -0400)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoisReadOnly() now takes arguments
Evan Prodromou [Mon, 13 Apr 2009 19:49:26 +0000 (15:49 -0400)]
isReadOnly() now takes arguments

Add an array of arguments to isReadOnly() method of actions, to let
them change their results depending on what actions are called.
Primarily used by the 'api' action. Ideally in the future that will be
multiple actions. But this might still be useful.

15 years agoMoved layout styles to base stylesheet.
Sarven Capadisli [Mon, 13 Apr 2009 17:26:12 +0000 (17:26 +0000)]
Moved layout styles to base stylesheet.

15 years agoTicket 1419. Added config option to set site to private.
Sarven Capadisli [Mon, 13 Apr 2009 16:40:51 +0000 (16:40 +0000)]
Ticket 1419. Added config option to set site to private.

15 years agoRemoving h1 from display in Profile page due to duplicate visibility
Sarven Capadisli [Mon, 13 Apr 2009 03:05:00 +0000 (03:05 +0000)]
Removing h1 from display in Profile page due to duplicate visibility
of fn and nickname.

15 years agoUpdated styles for the Authrization subscription form inputs
Sarven Capadisli [Sun, 12 Apr 2009 21:50:14 +0000 (21:50 +0000)]
Updated styles for the Authrization subscription form inputs

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Sarven Capadisli [Sun, 12 Apr 2009 21:41:20 +0000 (21:41 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoUpdated markup for entity_profile on Authorize subscription page.
Sarven Capadisli [Sun, 12 Apr 2009 21:40:29 +0000 (21:40 +0000)]
Updated markup for entity_profile on Authorize subscription page.

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Sun, 12 Apr 2009 19:35:33 +0000 (15:35 -0400)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoUpdate XML generation and list of actions in public XRDS
Evan Prodromou [Sun, 12 Apr 2009 19:34:38 +0000 (15:34 -0400)]
Update XML generation and list of actions in public XRDS

Updated the XML generation calls and list of actions in the public
XRDS document.

15 years agoUpdated Polish translations made by Piotr Drąg.
Sarven Capadisli [Sun, 12 Apr 2009 18:33:56 +0000 (18:33 +0000)]
Updated Polish translations made by Piotr Drąg.

15 years agotag stream is read-only
Evan Prodromou [Sat, 11 Apr 2009 02:47:40 +0000 (22:47 -0400)]
tag stream is read-only

15 years agoadd cliqset
Evan Prodromou [Fri, 10 Apr 2009 15:36:46 +0000 (11:36 -0400)]
add cliqset

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Fri, 10 Apr 2009 14:48:13 +0000 (10:48 -0400)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoAdded maisha to notice_source
Evan Prodromou [Fri, 10 Apr 2009 14:47:53 +0000 (10:47 -0400)]
Added maisha to notice_source

15 years agoMerge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x
Tobias Diekershoff [Fri, 10 Apr 2009 12:25:25 +0000 (14:25 +0200)]
Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x

15 years agoFixes ticket:1409; correct typo 'subcription' to 'subscription' in HTML and CSS.
Meitar Moscovitz [Thu, 9 Apr 2009 17:52:39 +0000 (13:52 -0400)]
Fixes ticket:1409; correct typo 'subcription' to 'subscription' in HTML and CSS.

15 years agoCorrected error in README relating to ['newuser']['welcome']
CiaranG [Thu, 9 Apr 2009 17:29:31 +0000 (18:29 +0100)]
Corrected error in README relating to ['newuser']['welcome']

15 years agoMerge branch 'master' of git://gitorious.org/laconica/br3nda into review/master
CiaranG [Wed, 8 Apr 2009 21:11:58 +0000 (22:11 +0100)]
Merge branch 'master' of git://gitorious.org/laconica/br3nda into review/master

15 years agoFixes the issue mentioned in commit 7fc90d5. Changed the margin value
Sarven Capadisli [Wed, 8 Apr 2009 20:54:37 +0000 (20:54 +0000)]
Fixes the issue mentioned in commit 7fc90d5. Changed the margin value
that's specific to the Inbox/Outbox page only.

15 years agoUsing encodeURIComponent for document.title
Sarven Capadisli [Wed, 8 Apr 2009 20:36:50 +0000 (20:36 +0000)]
Using encodeURIComponent for document.title

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Sarven Capadisli [Wed, 8 Apr 2009 20:01:00 +0000 (20:01 +0000)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoUsing 800px width and using document.title if no text is selected.
Sarven Capadisli [Wed, 8 Apr 2009 19:59:59 +0000 (19:59 +0000)]
Using 800px width and using document.title if no text is selected.

15 years agoRemove extranneous bottom margins on label; fix Safari layout bug.
Meitar Moscovitz [Wed, 8 Apr 2009 19:26:27 +0000 (15:26 -0400)]
Remove extranneous bottom margins on label; fix Safari layout bug.

This margin causes a layout bug in Safari whereby the Inbox and Outbox
pages have a notice form textarea that's too wide, causing it to slide
beneath the "Send" button on those pages. Removing this margin seems to
be completely innocuous in my tests, which covered Safari, Firefox,
Opera, and Internet Explorer 7. Can less be more? :)

15 years agoMinor update for 800px width viewport
Sarven Capadisli [Wed, 8 Apr 2009 18:52:05 +0000 (18:52 +0000)]
Minor update for 800px width viewport

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Wed, 8 Apr 2009 04:58:52 +0000 (00:58 -0400)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agoBetter debugging output flag
Zach Copley [Wed, 8 Apr 2009 04:46:00 +0000 (04:46 +0000)]
Better debugging output flag

15 years agouse mini logo at mini size, not stream logo
Evan Prodromou [Wed, 8 Apr 2009 04:32:28 +0000 (00:32 -0400)]
use mini logo at mini size, not stream logo

15 years agofar fewer icons in the sidebar
Evan Prodromou [Wed, 8 Apr 2009 04:27:04 +0000 (00:27 -0400)]
far fewer icons in the sidebar

15 years agoMerge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Evan Prodromou [Wed, 8 Apr 2009 04:15:14 +0000 (00:15 -0400)]
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

15 years agobookmarklet now uses non-fancy URLs to make sure it works in all cases.
Robin Millette [Wed, 8 Apr 2009 04:10:58 +0000 (04:10 +0000)]
bookmarklet now uses non-fancy URLs to make sure it works in all cases.

15 years agodon't use count() to check for empty page
Evan Prodromou [Wed, 8 Apr 2009 03:57:45 +0000 (23:57 -0400)]
don't use count() to check for empty page

15 years agoMerge branch '0.7.x'
Evan Prodromou [Wed, 8 Apr 2009 03:06:23 +0000 (23:06 -0400)]
Merge branch '0.7.x'

15 years agoUpdate README and common for new version
Evan Prodromou [Wed, 8 Apr 2009 03:02:55 +0000 (23:02 -0400)]
Update README and common for new version

Update versions in README, add the new song title, and update the
version stamp in the common.php file.

15 years agoadd bookmarklet to main help
Evan Prodromou [Wed, 8 Apr 2009 02:50:15 +0000 (22:50 -0400)]
add bookmarklet to main help

15 years agoMerge branch 'master' of git://gitorious.org/laconica/brianjesse-clone into brianjess...
Evan Prodromou [Wed, 8 Apr 2009 02:32:58 +0000 (22:32 -0400)]
Merge branch 'master' of git://gitorious.org/laconica/brianjesse-clone into brianjesse-clone/master

15 years agoMerge branch 'adrianlang-827' of git://gitorious.org/laconica/adrianlang-clone into...
Evan Prodromou [Wed, 8 Apr 2009 02:29:48 +0000 (22:29 -0400)]
Merge branch 'adrianlang-827' of git://gitorious.org/laconica/adrianlang-clone into 0.7.x