statusnet:jbfavre-fixes.git
4 years agoFix for #3463. Make InfiniteScroll plugin use config['plugins']['server'] if defined...
Jean Baptiste Favre [Sun, 18 Dec 2011 15:19:32 +0000 (16:19 +0100)]
Fix for #3463. Make InfiniteScroll plugin use config['plugins']['server'] if defined to build ajax-loader.gif URL

4 years agoFix missing variable in InfiniteScrollPlugin class. Fix issue #3525
Jean Baptiste Favre [Tue, 13 Dec 2011 21:09:08 +0000 (22:09 +0100)]
Fix missing variable in InfiniteScrollPlugin class. Fix issue #3525

4 years agoMakes ClientSideShorten loading shorten.js from config['plugins']['server'] if setted...
Jean Baptiste Favre [Sun, 18 Dec 2011 14:09:53 +0000 (15:09 +0100)]
Makes ClientSideShorten loading shorten.js from config['plugins']['server'] if setted. Fix #3528

4 years agoGet rid of t.co links for notice's text version. Usefull for client using API. Comple...
Jean Baptiste Favre [Fri, 14 Jun 2013 21:27:24 +0000 (23:27 +0200)]
Get rid of t.co links for notice's text version. Usefull for client using API. Complements merge-request #205 by @mmn

4 years agoBad variable in ActivityObject::fromMessage()
Evan Prodromou [Sun, 9 Jun 2013 01:05:09 +0000 (21:05 -0400)]
Bad variable in ActivityObject::fromMessage()

4 years agoBad variable in Message::asActivity()
Evan Prodromou [Sun, 9 Jun 2013 01:04:51 +0000 (21:04 -0400)]
Bad variable in Message::asActivity()

4 years agoUse the link property for the URL, not the ID
Evan Prodromou [Sat, 8 Jun 2013 23:18:28 +0000 (19:18 -0400)]
Use the link property for the URL, not the ID

4 years agoAdd direct messages to backup
Evan Prodromou [Sat, 8 Jun 2013 21:53:47 +0000 (17:53 -0400)]
Add direct messages to backup

4 years agoStore direct messages as an activity
Evan Prodromou [Sat, 8 Jun 2013 21:45:49 +0000 (17:45 -0400)]
Store direct messages as an activity

4 years agoMerge remote-tracking branch 'origin/master'
Evan Prodromou [Sat, 8 Jun 2013 18:58:36 +0000 (14:58 -0400)]
Merge remote-tracking branch 'origin/master'

4 years agoMerge remote-tracking branch 'origin/master'
Evan Prodromou [Sat, 8 Jun 2013 18:57:20 +0000 (14:57 -0400)]
Merge remote-tracking branch 'origin/master'

4 years agoThrow exception if subscription is invalid
Evan Prodromou [Sat, 8 Jun 2013 18:56:57 +0000 (14:56 -0400)]
Throw exception if subscription is invalid

4 years agoSome more well-known sources from plugins
Evan Prodromou [Fri, 7 Jun 2013 15:49:34 +0000 (11:49 -0400)]
Some more well-known sources from plugins

4 years agoAdd generator to JSON output
Evan Prodromou [Fri, 7 Jun 2013 15:34:54 +0000 (11:34 -0400)]
Add generator to JSON output

4 years agoSome better context for notices as arrays
Evan Prodromou [Fri, 7 Jun 2013 07:11:23 +0000 (03:11 -0400)]
Some better context for notices as arrays

4 years agoCoerce width, height of media link to integer
Evan Prodromou [Fri, 7 Jun 2013 04:30:04 +0000 (00:30 -0400)]
Coerce width, height of media link to integer

4 years agoFix the switch on type
Evan Prodromou [Wed, 5 Jun 2013 20:58:31 +0000 (16:58 -0400)]
Fix the switch on type

4 years agoBetter type check, better URL
Evan Prodromou [Wed, 5 Jun 2013 20:51:35 +0000 (16:51 -0400)]
Better type check, better URL

4 years agoBetter URL creation for attachments
Evan Prodromou [Wed, 5 Jun 2013 20:12:54 +0000 (16:12 -0400)]
Better URL creation for attachments

4 years agoBetter handling of null values in ActivityObject::mimeTypeToObjectType
Evan Prodromou [Wed, 5 Jun 2013 20:11:51 +0000 (16:11 -0400)]
Better handling of null values in ActivityObject::mimeTypeToObjectType

4 years agoUse real attachments for JSON output
Evan Prodromou [Wed, 5 Jun 2013 13:39:13 +0000 (09:39 -0400)]
Use real attachments for JSON output

4 years agoDon't set the title of a notice to its plain-text content.
Evan Prodromou [Wed, 5 Jun 2013 02:27:29 +0000 (22:27 -0400)]
Don't set the title of a notice to its plain-text content.

4 years agoDon't add content as title for notes
Evan Prodromou [Tue, 4 Jun 2013 23:52:38 +0000 (19:52 -0400)]
Don't add content as title for notes

4 years agoChange geopoint to location
Evan Prodromou [Tue, 4 Jun 2013 21:22:51 +0000 (17:22 -0400)]
Change geopoint to location

4 years agoRemove duplicate of extensions
Evan Prodromou [Tue, 4 Jun 2013 21:15:43 +0000 (17:15 -0400)]
Remove duplicate of extensions

4 years agoUse status_net, portablecontacts_net namespaces
Evan Prodromou [Tue, 4 Jun 2013 21:12:28 +0000 (17:12 -0400)]
Use status_net, portablecontacts_net namespaces

4 years agoSlightly better ActivityStreams JSON output
Evan Prodromou [Tue, 4 Jun 2013 21:00:51 +0000 (17:00 -0400)]
Slightly better ActivityStreams JSON output

4 years agoUse better type, title for service
Evan Prodromou [Tue, 4 Jun 2013 20:30:40 +0000 (16:30 -0400)]
Use better type, title for service

4 years agoAdd the service type for activity objects
Evan Prodromou [Tue, 4 Jun 2013 20:29:47 +0000 (16:29 -0400)]
Add the service type for activity objects

4 years agoBetter handling of multiple objects
Evan Prodromou [Tue, 4 Jun 2013 19:20:21 +0000 (15:20 -0400)]
Better handling of multiple objects

4 years agoBetter registrationActivity
Evan Prodromou [Tue, 4 Jun 2013 19:20:00 +0000 (15:20 -0400)]
Better registrationActivity

4 years agoOnly a single object in activitystrea.ms JSON output
Evan Prodromou [Mon, 3 Jun 2013 13:10:56 +0000 (09:10 -0400)]
Only a single object in activitystrea.ms JSON output

4 years agoAdd an ID to registered service
Evan Prodromou [Mon, 3 Jun 2013 12:55:00 +0000 (08:55 -0400)]
Add an ID to registered service

4 years agoMerge branch 'master' of gitorious.org:statusnet/mainline
Evan Prodromou [Sun, 2 Jun 2013 19:24:57 +0000 (15:24 -0400)]
Merge branch 'master' of gitorious.org:statusnet/mainline

4 years agoAdd a registration activity to the end of every backup
Evan Prodromou [Sun, 2 Jun 2013 18:38:00 +0000 (14:38 -0400)]
Add a registration activity to the end of every backup

4 years agoClose the collection object
Evan Prodromou [Wed, 29 May 2013 21:03:08 +0000 (17:03 -0400)]
Close the collection object

4 years agoCorrectly output commas for JSON backups
Evan Prodromou [Wed, 29 May 2013 20:45:52 +0000 (16:45 -0400)]
Correctly output commas for JSON backups

4 years agoAdd JSON output for backups
Evan Prodromou [Fri, 24 May 2013 17:50:24 +0000 (13:50 -0400)]
Add JSON output for backups

Conflicts:
lib/useractivitystream.php

4 years agoThrow an exception converting fave to activity for non-existent notice or profile
Evan Prodromou [Fri, 24 May 2013 13:26:58 +0000 (09:26 -0400)]
Throw an exception converting fave to activity for non-existent notice or profile

4 years agoDon't abort if an activity throws an exception when backing up
Evan Prodromou [Thu, 23 May 2013 19:02:30 +0000 (15:02 -0400)]
Don't abort if an activity throws an exception when backing up

4 years agoMake optional arguments for getNoticeIds explicit
Evan Prodromou [Tue, 30 Apr 2013 13:56:14 +0000 (09:56 -0400)]
Make optional arguments for getNoticeIds explicit

4 years agoBy default Notice::asActivity has a null argument
Evan Prodromou [Sun, 14 Apr 2013 16:02:52 +0000 (12:02 -0400)]
By default Notice::asActivity has a null argument

4 years agoCheck that it's spam!
Evan Prodromou [Wed, 13 Feb 2013 15:55:32 +0000 (10:55 -0500)]
Check that it's spam!

4 years agoshow percentage in output
Evan Prodromou [Wed, 13 Feb 2013 15:04:43 +0000 (10:04 -0500)]
show percentage in output

4 years agoMerge branch 'master' of gitorious.org:statusnet/mainline
Evan Prodromou [Wed, 13 Feb 2013 15:01:23 +0000 (10:01 -0500)]
Merge branch 'master' of gitorious.org:statusnet/mainline

4 years agoUpdates to silencespammer from production
Evan Prodromou [Wed, 13 Feb 2013 15:00:47 +0000 (10:00 -0500)]
Updates to silencespammer from production

4 years agoScript to silence spammers
Evan Prodromou [Wed, 13 Feb 2013 14:50:28 +0000 (09:50 -0500)]
Script to silence spammers

5 years agoIf there's an exception in notice distribution, continue
Evan Prodromou [Sun, 25 Nov 2012 15:39:49 +0000 (10:39 -0500)]
If there's an exception in notice distribution, continue

5 years ago$this->q => $q
Evan Prodromou [Mon, 12 Nov 2012 03:55:22 +0000 (22:55 -0500)]
$this->q => $q

5 years agoStill bad
Evan Prodromou [Mon, 12 Nov 2012 02:36:42 +0000 (21:36 -0500)]
Still bad

5 years agoBad caching parameter
Evan Prodromou [Mon, 12 Nov 2012 02:34:40 +0000 (21:34 -0500)]
Bad caching parameter

5 years agoDivert tag and url searches
Evan Prodromou [Mon, 12 Nov 2012 02:27:11 +0000 (21:27 -0500)]
Divert tag and url searches

5 years agoAdding a search notice stream object
Evan Prodromou [Mon, 12 Nov 2012 02:05:13 +0000 (21:05 -0500)]
Adding a search notice stream object

5 years agoAdd a flag to not deliver poll responses to home timeline
Evan Prodromou [Tue, 6 Nov 2012 15:24:05 +0000 (10:24 -0500)]
Add a flag to not deliver poll responses to home timeline

Some people really hate getting poll responses in their home timeline,
so there's now a flag to disable that.

5 years agomrb reported 417 Expectation failed errors due to now commented line
Mikael Nordfeldth [Sat, 27 Oct 2012 08:40:31 +0000 (10:40 +0200)]
mrb reported 417 Expectation failed errors due to now commented line

5 years agoDon't show big invite button if invites are disabled
Evan Prodromou [Wed, 17 Oct 2012 14:09:40 +0000 (10:09 -0400)]
Don't show big invite button if invites are disabled

5 years agoMerge branch '1.1.x'
Evan Prodromou [Fri, 7 Sep 2012 14:29:55 +0000 (10:29 -0400)]
Merge branch '1.1.x'

5 years agoDon't send @-reply notification if the mentioned person has blocked the sender
Evan Prodromou [Fri, 7 Sep 2012 14:27:14 +0000 (10:27 -0400)]
Don't send @-reply notification if the mentioned person has blocked the sender

5 years agoSquashed commit of the following:
Evan Prodromou [Mon, 13 Aug 2012 18:33:19 +0000 (14:33 -0400)]
Squashed commit of the following:

commit 2b9bce9ef8f6cf55b7ac62231bcc0173260ba472
Merge: 3ba4f24 12b680e
Author: Evan Prodromou <evan@status.net>
Date:   Mon Aug 13 14:31:46 2012 -0400

    Merge commit 'refs/merge-requests/207' of git://gitorious.org/statusnet/mainline into merge-requests/207

commit 12b680e375db9de01cac77dd9a71adb729292dc7
Author: Mikael Nordfeldth <mmn@hethane.se>
Date:   Fri Aug 10 20:49:52 2012 +0200

    testing whether $user is predefined before otherwise setting it to common_current_user()

5 years agoSquashed commit of the following:
Evan Prodromou [Mon, 13 Aug 2012 18:33:19 +0000 (14:33 -0400)]
Squashed commit of the following:

commit 2b9bce9ef8f6cf55b7ac62231bcc0173260ba472
Merge: 3ba4f24 12b680e
Author: Evan Prodromou <evan@status.net>
Date:   Mon Aug 13 14:31:46 2012 -0400

    Merge commit 'refs/merge-requests/207' of git://gitorious.org/statusnet/mainline into merge-requests/207

commit 12b680e375db9de01cac77dd9a71adb729292dc7
Author: Mikael Nordfeldth <mmn@hethane.se>
Date:   Fri Aug 10 20:49:52 2012 +0200

    testing whether $user is predefined before otherwise setting it to common_current_user()

5 years agoMerge branch 'master' of gitorious.org:statusnet/mainline
Evan Prodromou [Sat, 28 Jul 2012 17:59:40 +0000 (13:59 -0400)]
Merge branch 'master' of gitorious.org:statusnet/mainline

5 years agoMerge branch '1.1.x'
Evan Prodromou [Sat, 28 Jul 2012 17:59:03 +0000 (13:59 -0400)]
Merge branch '1.1.x'

5 years agoIssue 3401, ostatus group subscription lands on blank page
Mikael Nordfeldth [Fri, 13 Jul 2012 12:30:58 +0000 (14:30 +0200)]
Issue 3401, ostatus group subscription lands on blank page

5 years agoMerge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
Evan Prodromou [Sat, 28 Jul 2012 17:55:10 +0000 (13:55 -0400)]
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x

5 years agoSquashed commit of the following:
Evan Prodromou [Tue, 10 Jul 2012 16:25:19 +0000 (12:25 -0400)]
Squashed commit of the following:

commit c2e8966fe76a30ce976973d6d4856cb6bff1cfc9
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:20:29 2012 -0400

    Do it in ascending date order

commit aff18666662e7ba9f23b2d4c30d49347a761cd0a
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:17:30 2012 -0400

    smaller year

commit 73c92c081c68cee5019adf1b9e813c7830dd8f87
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:16:39 2012 -0400

    Smaller role footprint

commit a602733dd6f82415706077218f5735b655e47f70
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:14:23 2012 -0400

    Add the right to view the log

commit a5e6cc9791e6ed1ca268b19b6c557ec78bc38e2d
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:10:15 2012 -0400

    Change column name from 'grant' to 'is_grant' since 'grant' is a SQL keyword

commit 38fbba009cd7ae379583acdc48480829c40c829d
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:05:44 2012 -0400

    ModLog::getSchema() -> ModLog::schemaDef()

commit 970e05d52a4a82630df6962929079c778c118a8b
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:04:08 2012 -0400

    First pass at ModLog plugin

5 years agoSquashed commit of the following:
Evan Prodromou [Mon, 9 Jul 2012 20:51:36 +0000 (16:51 -0400)]
Squashed commit of the following:

commit 90620124a20d8c9da19b26920b02b521766c42e4
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 16:50:05 2012 -0400

    Add a checkbox to hide OpenID links

commit 47a4a5824208868bd5f4f163456f8e08380e5f36
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 16:35:15 2012 -0400

    Don't show the profile links if the hide_profile_link flag is set

commit eafd4b8ba1f7c06c92e5279b1a703c5534aa7255
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 16:30:23 2012 -0400

    class for user_openid_prefs table

commit 60e3e3825b20745c08b4d30dbbcac2d7ce604a2f
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 16:29:15 2012 -0400

    add User_openid_prefs table and class

5 years agoFix formatting of header
Evan Prodromou [Mon, 9 Jul 2012 19:59:10 +0000 (15:59 -0400)]
Fix formatting of header

5 years agoRemove "@" from hover text; most people don't use "@" on Facebook
Evan Prodromou [Mon, 9 Jul 2012 17:57:51 +0000 (13:57 -0400)]
Remove "@" from hover text; most people don't use "@" on Facebook

5 years ago<a title="..." on profile block other accounts
Evan Prodromou [Mon, 9 Jul 2012 17:46:32 +0000 (13:46 -0400)]
<a title="..." on profile block other accounts

5 years agoBetter cache key, httpclient reference in FacebookBridgePlugin
Evan Prodromou [Mon, 9 Jul 2012 17:37:33 +0000 (13:37 -0400)]
Better cache key, httpclient reference in FacebookBridgePlugin

5 years agoFinish out the ul for other accounts
Evan Prodromou [Mon, 9 Jul 2012 17:21:14 +0000 (13:21 -0400)]
Finish out the ul for other accounts

5 years agoSquashed commit of the following:
Evan Prodromou [Mon, 9 Jul 2012 16:55:05 +0000 (12:55 -0400)]
Squashed commit of the following:

commit 7ef19ab918cc9805abb8d01e8220ae4ed63155d7
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 12:53:29 2012 -0400

    Show link to facebook account on profile block

    If you've logged in with Facebook, show a link to that account on the profile block.

commit b56967479c009d702150791944dbd80746ee3ba1
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 12:28:34 2012 -0400

    Add profile link from profile block to Twitter account

    Add a profile link to Twitter for accounts that are linked via Twitter login.

commit 181e441fd03c6034e737f6a3dae115557aa3e1aa
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:57:56 2012 -0400

    OpenID shows other account links

commit ef7357883dad9e34af2746e1c6a41ea826d7c992
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:53:12 2012 -0400

    Add a profile link for OpenIDs

    OpenID plugin now adds a profile link for each OpenID on the account.

commit 093d26b95bc453686d24c42f5a8f4739cb338fd2
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:15:18 2012 -0400

    Better array access

commit 49d47257efdcae2101b589a1f825872bdd70667c
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 10:57:16 2012 -0400

    Show list of other accounts in profile block

    We add a group of "rel-me" links to other user accounts on the Web.

    This is mostly useful for when you've used OpenID, Twitter, or
    Facebook login to associate a remote account.

    There's an extension to the profileblock recipe to show the links as
    little icons; there's a new hook in accountprofileblock to get such
    links from plugins.

    There's a modification to the base theme to show the icons correctly
    (I think).

5 years agoMerge branch '1.1.x'
Evan Prodromou [Mon, 9 Jul 2012 13:46:45 +0000 (09:46 -0400)]
Merge branch '1.1.x'

5 years agoSquashed commit of the following:
Evan Prodromou [Mon, 9 Jul 2012 13:45:53 +0000 (09:45 -0400)]
Squashed commit of the following:

commit f4503f30226fee59160600b5c9b81afc6b610a9d
Merge: 75f3b4e f10e48c
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 09:45:10 2012 -0400

    Merge commit 'refs/merge-requests/194' of git://gitorious.org/statusnet/mainline into merge-requests/194

commit f10e48c361d91ab02efc5577254e1dad3b1dcebe
Author: Mikael Nordfeldth <mmn@hethane.se>
Date:   Thu Jul 5 14:28:30 2012 +0200

    multiGet returns a correct Notice object for the fetchAll in NoticeList

5 years agoSquashed commit of the following:
Evan Prodromou [Mon, 9 Jul 2012 13:43:05 +0000 (09:43 -0400)]
Squashed commit of the following:

commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc adaf175
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 09:41:05 2012 -0400

    Merge commit 'refs/merge-requests/196' of git://gitorious.org/statusnet/mainline into merge-requests/196

commit adaf17552d3ab35d451c00cdb32d87a107e0e56a
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:33:06 2012 -0500

    fix for XMPP high CPU usage - issue no 3232

commit e573e8ee6690af94259ff8793a84652a139d0662
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:30:34 2012 -0500

    fix for queuedaemon and imdaemon not being stopped by stopdaemons.sh

5 years agoSquashed commit of the following:
Evan Prodromou [Mon, 9 Jul 2012 13:43:05 +0000 (09:43 -0400)]
Squashed commit of the following:

commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc adaf175
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 09:41:05 2012 -0400

    Merge commit 'refs/merge-requests/196' of git://gitorious.org/statusnet/mainline into merge-requests/196

commit adaf17552d3ab35d451c00cdb32d87a107e0e56a
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:33:06 2012 -0500

    fix for XMPP high CPU usage - issue no 3232

commit e573e8ee6690af94259ff8793a84652a139d0662
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:30:34 2012 -0500

    fix for queuedaemon and imdaemon not being stopped by stopdaemons.sh

5 years agoMerge remote-tracking branch 'origin'
Evan Prodromou [Mon, 9 Jul 2012 13:33:42 +0000 (09:33 -0400)]
Merge remote-tracking branch 'origin'

5 years agonewer sitestream host
Evan Prodromou [Fri, 6 Jul 2012 15:11:53 +0000 (11:11 -0400)]
newer sitestream host

5 years agoMerge branch 'master' of gitorious.org:statusnet/mainline
Evan Prodromou [Fri, 6 Jul 2012 14:47:28 +0000 (10:47 -0400)]
Merge branch 'master' of gitorious.org:statusnet/mainline

5 years agoMerge branch '1.1.x'
Evan Prodromou [Fri, 6 Jul 2012 14:47:00 +0000 (10:47 -0400)]
Merge branch '1.1.x'

5 years agoRemove Jabber stuff from Twitter daemon
Evan Prodromou [Fri, 6 Jul 2012 14:46:48 +0000 (10:46 -0400)]
Remove Jabber stuff from Twitter daemon

5 years agoAdd a trace, too
Evan Prodromou [Wed, 4 Jul 2012 19:14:35 +0000 (15:14 -0400)]
Add a trace, too

5 years agoAdd an exception on remote group join
Evan Prodromou [Wed, 4 Jul 2012 19:12:08 +0000 (15:12 -0400)]
Add an exception on remote group join

5 years agoDon't call free on the results of a member query
Evan Prodromou [Wed, 4 Jul 2012 18:45:50 +0000 (14:45 -0400)]
Don't call free on the results of a member query

5 years agocache key for member_ids
Evan Prodromou [Wed, 4 Jul 2012 18:39:26 +0000 (14:39 -0400)]
cache key for member_ids

5 years agoCache IDs rather than profile objects
Evan Prodromou [Wed, 4 Jul 2012 18:38:06 +0000 (14:38 -0400)]
Cache IDs rather than profile objects

5 years agoBetter user group member queries
Evan Prodromou [Wed, 4 Jul 2012 18:11:42 +0000 (14:11 -0400)]
Better user group member queries

5 years agoMerge remote-tracking branch 'origin/master'
Evan Prodromou [Wed, 4 Jul 2012 17:22:58 +0000 (13:22 -0400)]
Merge remote-tracking branch 'origin/master'

5 years agoCorrect sprintf() information
Evan Prodromou [Tue, 3 Jul 2012 21:33:27 +0000 (17:33 -0400)]
Correct sprintf() information

5 years agoFix language code for users
Evan Prodromou [Tue, 3 Jul 2012 21:12:59 +0000 (17:12 -0400)]
Fix language code for users

5 years agotickle lifecycle
Evan Prodromou [Tue, 3 Jul 2012 20:17:30 +0000 (16:17 -0400)]
tickle lifecycle

5 years agoMerge branch '1.1.x'
Evan Prodromou [Tue, 3 Jul 2012 19:42:51 +0000 (15:42 -0400)]
Merge branch '1.1.x'

5 years agoRelease date
Evan Prodromou [Tue, 3 Jul 2012 19:42:35 +0000 (15:42 -0400)]
Release date

5 years agoMerge branch '1.1.x'
Evan Prodromou [Tue, 3 Jul 2012 19:38:11 +0000 (15:38 -0400)]
Merge branch '1.1.x'

5 years agoMerge branch '1.1.x'
Evan Prodromou [Tue, 3 Jul 2012 16:27:34 +0000 (12:27 -0400)]
Merge branch '1.1.x'

5 years agoMerge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
Evan Prodromou [Tue, 3 Jul 2012 16:27:10 +0000 (12:27 -0400)]
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x

5 years agoUse the current logged-in use for home timeline
Evan Prodromou [Tue, 3 Jul 2012 16:22:59 +0000 (12:22 -0400)]
Use the current logged-in use for home timeline

5 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 30 Jun 2012 11:10:38 +0000 (11:10 +0000)]
Localisation updates from translatewiki.net.

5 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 24 Jun 2012 18:26:18 +0000 (18:26 +0000)]
Localisation updates from translatewiki.net.

5 years agoRemove i18n for space.
Siebrand Mazeland [Sun, 17 Jun 2012 23:56:06 +0000 (01:56 +0200)]
Remove i18n for space.
Remove trailing whitespace.