]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
14 years agostupid mistake... let's not talk about this.
Craig Andrews [Fri, 22 Jan 2010 15:40:21 +0000 (10:40 -0500)]
stupid mistake... let's not talk about this.

14 years agoUpdated some references to the long gnone "isEnclosure" function to the new "getEnclo...
Craig Andrews [Fri, 22 Jan 2010 15:12:26 +0000 (10:12 -0500)]
Updated some references to the long gnone "isEnclosure" function to the new "getEnclosure"

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Sarven Capadisli [Tue, 2 Mar 2010 20:26:27 +0000 (15:26 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoAdded Subscribe button to remote user entity actions in profie lists
Sarven Capadisli [Tue, 2 Mar 2010 20:25:32 +0000 (15:25 -0500)]
Added Subscribe button to remote user entity actions in profie lists

14 years agoDon't need to float the anchor
Sarven Capadisli [Tue, 2 Mar 2010 20:24:07 +0000 (15:24 -0500)]
Don't need to float the anchor

14 years agoMerge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Brion Vibber [Tue, 2 Mar 2010 20:21:48 +0000 (12:21 -0800)]
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing

14 years agoPerformance fix on Sphinx search results: use id instead of created timestamp for...
Brion Vibber [Tue, 2 Mar 2010 20:06:40 +0000 (12:06 -0800)]
Performance fix on Sphinx search results: use id instead of created timestamp for reverse date sorting; should give same result but doesn't trigger a filesort.

14 years agoDropped deprecated timestamp-based 'since' parameter for all API methods. When it...
Brion Vibber [Tue, 2 Mar 2010 19:54:02 +0000 (11:54 -0800)]
Dropped deprecated timestamp-based 'since' parameter for all API methods. When it sneaks in it can cause some very slow queries due to mismatches with the indexing.
Twitter removed 'since' support some time ago, and we've already removed it from the public timeline, so it shouldn't be missed.

14 years agoFix for regression in updated mention checks, sometimes lost links to folks mentioned...
Brion Vibber [Tue, 2 Mar 2010 17:53:00 +0000 (09:53 -0800)]
Fix for regression in updated mention checks, sometimes lost links to folks mentioned in the replied message.

14 years agoRefactored remote subscribe action in OStatus
Sarven Capadisli [Tue, 2 Mar 2010 17:41:18 +0000 (12:41 -0500)]
Refactored remote subscribe action in OStatus

14 years agoShowing remote subscription button on the personal timeline
Sarven Capadisli [Tue, 2 Mar 2010 17:35:27 +0000 (12:35 -0500)]
Showing remote subscription button on the personal timeline

14 years agoGeneralized style for entity remote subscription action
Sarven Capadisli [Tue, 2 Mar 2010 17:34:35 +0000 (12:34 -0500)]
Generalized style for entity remote subscription action

14 years agoAdded event hook for before and after personal timeline content
Sarven Capadisli [Tue, 2 Mar 2010 17:33:25 +0000 (12:33 -0500)]
Added event hook for before and after personal timeline content

14 years agoJust a label change. Since the user already went ahead with
Sarven Capadisli [Tue, 2 Mar 2010 14:57:28 +0000 (09:57 -0500)]
Just a label change. Since the user already went ahead with
subscribing, in this step we are just confirming the profile.

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Evan Prodromou [Tue, 2 Mar 2010 08:41:03 +0000 (03:41 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoRevert "Show <activity:subject> and no activity actors for user feed"
Evan Prodromou [Tue, 2 Mar 2010 08:40:43 +0000 (03:40 -0500)]
Revert "Show <activity:subject> and no activity actors for user feed"

This reverts commit c25fc8a4b51466f13c41efc0565bf15f78f6cb4d.

14 years agoMerge branch 'testing' of gitorious.org:statusnet/mainline into testing
Zach Copley [Tue, 2 Mar 2010 08:38:50 +0000 (00:38 -0800)]
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  don't duplicate title in summary in Atom output per RFC4287 4.2.13
  Show <activity:subject> and no activity actors for user feed
  Revert "show service debug info"

14 years agoUpdate Facebook plugin README with info about new admin panel
Zach Copley [Tue, 2 Mar 2010 08:38:00 +0000 (00:38 -0800)]
Update Facebook plugin README with info about new admin panel

14 years agodon't duplicate title in summary in Atom output per RFC4287 4.2.13
Evan Prodromou [Tue, 2 Mar 2010 08:13:05 +0000 (03:13 -0500)]
don't duplicate title in summary in Atom output per RFC4287 4.2.13

14 years agoMerge branch 'master' into testing
Evan Prodromou [Tue, 2 Mar 2010 07:57:35 +0000 (02:57 -0500)]
Merge branch 'master' into testing

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Evan Prodromou [Tue, 2 Mar 2010 07:56:57 +0000 (02:56 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoShow <activity:subject> and no activity actors for user feed
Evan Prodromou [Tue, 2 Mar 2010 07:54:52 +0000 (02:54 -0500)]
Show <activity:subject> and no activity actors for user feed

We only need one author for user feeds: the user themselves. So, show
the user as the activity:subject, and don't repeat the same
activity:actor for every notice unnecessarily.

14 years agoInitial Facebook admin panel
Zach Copley [Tue, 2 Mar 2010 07:31:56 +0000 (23:31 -0800)]
Initial Facebook admin panel

14 years agoSome wording / spelling fixes
Zach Copley [Tue, 2 Mar 2010 06:58:27 +0000 (22:58 -0800)]
Some wording / spelling fixes

14 years ago- Make 'Sign in with Twitter' optional
Zach Copley [Tue, 2 Mar 2010 06:41:07 +0000 (22:41 -0800)]
- Make 'Sign in with Twitter' optional
- Updates to the Twitter bridge plugin README

14 years agoMerge branch 'testing' of gitorious.org:statusnet/mainline into testing
Zach Copley [Tue, 2 Mar 2010 05:54:53 +0000 (21:54 -0800)]
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  High-priority OStatus fixes:
  OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)

14 years agoRemove un-needed config variable for enabling/disabling Twitter integration
Zach Copley [Tue, 2 Mar 2010 05:52:31 +0000 (21:52 -0800)]
Remove un-needed config variable for enabling/disabling Twitter integration

14 years agoInitial Twitter bridge admin panel
Zach Copley [Tue, 2 Mar 2010 05:34:50 +0000 (21:34 -0800)]
Initial Twitter bridge admin panel

14 years agoHigh-priority OStatus fixes:
Brion Vibber [Tue, 2 Mar 2010 02:46:34 +0000 (18:46 -0800)]
High-priority OStatus fixes:
* PuSHing out to multiple client services could fail; only first callback got reached
* Correction for re-sub request to a known sub

14 years agoHigh-priority OStatus fixes:
Brion Vibber [Tue, 2 Mar 2010 02:46:34 +0000 (18:46 -0800)]
High-priority OStatus fixes:
* PuSHing out to multiple client services could fail; only first callback got reached
* Correction for re-sub request to a known sub

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Brion Vibber [Tue, 2 Mar 2010 00:59:40 +0000 (16:59 -0800)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoMerge branch 'work' into testing
Brion Vibber [Tue, 2 Mar 2010 00:57:58 +0000 (16:57 -0800)]
Merge branch 'work' into testing

14 years agoOStatus: support @example.com/path/to/profile mentions as well as @profile@example...
Brion Vibber [Tue, 2 Mar 2010 00:36:33 +0000 (16:36 -0800)]
OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
Plus misc warnings/notices cleanup in the submission path.

14 years agoMerge branch 'testing' of gitorious.org:statusnet/mainline into testing
Zach Copley [Tue, 2 Mar 2010 00:38:56 +0000 (16:38 -0800)]
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline: (25 commits)
  Fix a bunch of notice & warning-level messages that were breaking my inter-instance communications
  more output in updateostatus.php
  lost important fields when switching queries
  show service debug info
  pass listener URI into consumer for OMB
  remove strict check on OMB exception strings
  return correct HTTP status code for OMB errors
  send smaller error pages for OMB API endpoints
  Remove check for secret in token deletion on Subscription::cancel()
  Better logging on bad token in subscription
  Return empty array when no subscriptions to remote
  drop tokens for OMB on unsubscribe
  fix path for updateostatus.php
  Script to convert OMB subscriptions to OStatus subscriptions
  show service debug info
  pass listener URI into consumer for OMB
  remove strict check on OMB exception strings
  return correct HTTP status code for OMB errors
  send smaller error pages for OMB API endpoints
  Remove check for secret in token deletion on Subscription::cancel()
  ...

14 years agoFix a bunch of notice & warning-level messages that were breaking my inter-instance...
Brion Vibber [Tue, 2 Mar 2010 00:35:36 +0000 (16:35 -0800)]
Fix a bunch of notice & warning-level messages that were breaking my inter-instance communications

14 years agoRevert "show service debug info"
Evan Prodromou [Mon, 1 Mar 2010 23:49:39 +0000 (18:49 -0500)]
Revert "show service debug info"

This reverts commit 19ec0e3a62d4c60d7e5581b4e38ec705650b1d18.

14 years agomore output in updateostatus.php
Evan Prodromou [Mon, 1 Mar 2010 23:19:20 +0000 (18:19 -0500)]
more output in updateostatus.php

14 years agoMerge branch 'omb2ostatus' of root@windba.gs:/var/www/statusnet into omb2ostatus
Evan Prodromou [Mon, 1 Mar 2010 23:08:31 +0000 (18:08 -0500)]
Merge branch 'omb2ostatus' of root@windba.gs:/var/www/statusnet into omb2ostatus

Conflicts:
lib/omb.php

14 years agolost important fields when switching queries
Evan Prodromou [Mon, 1 Mar 2010 23:07:21 +0000 (18:07 -0500)]
lost important fields when switching queries

14 years agoshow service debug info
Evan Prodromou [Mon, 1 Mar 2010 22:55:46 +0000 (17:55 -0500)]
show service debug info

14 years agopass listener URI into consumer for OMB
Evan Prodromou [Mon, 1 Mar 2010 20:59:24 +0000 (15:59 -0500)]
pass listener URI into consumer for OMB

14 years agoremove strict check on OMB exception strings
Evan Prodromou [Mon, 1 Mar 2010 20:39:41 +0000 (15:39 -0500)]
remove strict check on OMB exception strings

14 years agoreturn correct HTTP status code for OMB errors
Evan Prodromou [Mon, 1 Mar 2010 20:31:20 +0000 (15:31 -0500)]
return correct HTTP status code for OMB errors

14 years agosend smaller error pages for OMB API endpoints
Evan Prodromou [Mon, 1 Mar 2010 19:40:39 +0000 (14:40 -0500)]
send smaller error pages for OMB API endpoints

14 years agoRemove check for secret in token deletion on Subscription::cancel()
Evan Prodromou [Mon, 1 Mar 2010 19:35:38 +0000 (14:35 -0500)]
Remove check for secret in token deletion on Subscription::cancel()

14 years agoBetter logging on bad token in subscription
Evan Prodromou [Mon, 1 Mar 2010 19:30:28 +0000 (14:30 -0500)]
Better logging on bad token in subscription

14 years agoReturn empty array when no subscriptions to remote
Evan Prodromou [Mon, 1 Mar 2010 19:17:25 +0000 (14:17 -0500)]
Return empty array when no subscriptions to remote

14 years agodrop tokens for OMB on unsubscribe
Evan Prodromou [Mon, 1 Mar 2010 18:41:06 +0000 (13:41 -0500)]
drop tokens for OMB on unsubscribe

14 years agofix path for updateostatus.php
Evan Prodromou [Mon, 1 Mar 2010 18:13:51 +0000 (13:13 -0500)]
fix path for updateostatus.php

14 years agoScript to convert OMB subscriptions to OStatus subscriptions
Evan Prodromou [Mon, 1 Mar 2010 17:55:51 +0000 (12:55 -0500)]
Script to convert OMB subscriptions to OStatus subscriptions

14 years agoMerge branch 'testing' of gitorious.org:statusnet/mainline into testing
Zach Copley [Mon, 1 Mar 2010 22:59:54 +0000 (14:59 -0800)]
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  Localization tweak: include doc comments marked as 'TRANS' in .po file output; these should now get automatically pulled through to the TranslateWiki interface as translator help hints.
  Add index on group_index.notice_id, needed to pull list of target groups for inbox delivery.
  Add index on post_id for file_to_post, needed for efficient lookups of files/urls attached to a given post.
  Update pot file

14 years agoUpgrade XML output scrubbing to better deal with newline and a few other chars
Zach Copley [Mon, 1 Mar 2010 22:58:06 +0000 (14:58 -0800)]
Upgrade XML output scrubbing to better deal with newline and a few other chars

14 years agoshow service debug info
Evan Prodromou [Mon, 1 Mar 2010 22:55:46 +0000 (17:55 -0500)]
show service debug info

14 years agoMerge branch 'master' of gitorious.org:statusnet/mainline into testing
Brion Vibber [Mon, 1 Mar 2010 22:55:09 +0000 (14:55 -0800)]
Merge branch 'master' of gitorious.org:statusnet/mainline into testing

14 years agoLocalization tweak: include doc comments marked as 'TRANS' in .po file output; these...
Brion Vibber [Mon, 1 Mar 2010 22:10:13 +0000 (14:10 -0800)]
Localization tweak: include doc comments marked as 'TRANS' in .po file output; these should now get automatically pulled through to the TranslateWiki interface as translator help hints.

14 years agoAdd index on group_index.notice_id, needed to pull list of target groups for inbox...
Brion Vibber [Mon, 1 Mar 2010 21:09:20 +0000 (13:09 -0800)]
Add index on group_index.notice_id, needed to pull list of target groups for inbox delivery.
Index was present on live identi.ca database but missing from master definitions: group_inbox_notice_id_idx

14 years agopass listener URI into consumer for OMB
Evan Prodromou [Mon, 1 Mar 2010 20:59:24 +0000 (15:59 -0500)]
pass listener URI into consumer for OMB

14 years agoremove strict check on OMB exception strings
Evan Prodromou [Mon, 1 Mar 2010 20:39:41 +0000 (15:39 -0500)]
remove strict check on OMB exception strings

14 years agoreturn correct HTTP status code for OMB errors
Evan Prodromou [Mon, 1 Mar 2010 20:31:20 +0000 (15:31 -0500)]
return correct HTTP status code for OMB errors

14 years agoAdd index on post_id for file_to_post, needed for efficient lookups of files/urls...
Brion Vibber [Mon, 1 Mar 2010 20:20:04 +0000 (12:20 -0800)]
Add index on post_id for file_to_post, needed for efficient lookups of files/urls attached to a given post.

14 years agosend smaller error pages for OMB API endpoints
Evan Prodromou [Mon, 1 Mar 2010 19:40:39 +0000 (14:40 -0500)]
send smaller error pages for OMB API endpoints

14 years agoRemove check for secret in token deletion on Subscription::cancel()
Evan Prodromou [Mon, 1 Mar 2010 19:35:38 +0000 (14:35 -0500)]
Remove check for secret in token deletion on Subscription::cancel()

14 years agoBetter logging on bad token in subscription
Evan Prodromou [Mon, 1 Mar 2010 19:30:28 +0000 (14:30 -0500)]
Better logging on bad token in subscription

14 years agoReturn empty array when no subscriptions to remote
Evan Prodromou [Mon, 1 Mar 2010 19:17:25 +0000 (14:17 -0500)]
Return empty array when no subscriptions to remote

14 years agodrop tokens for OMB on unsubscribe
Evan Prodromou [Mon, 1 Mar 2010 18:41:06 +0000 (13:41 -0500)]
drop tokens for OMB on unsubscribe

14 years agofix path for updateostatus.php
Evan Prodromou [Mon, 1 Mar 2010 18:13:51 +0000 (13:13 -0500)]
fix path for updateostatus.php

14 years agoScript to convert OMB subscriptions to OStatus subscriptions
Evan Prodromou [Mon, 1 Mar 2010 17:55:51 +0000 (12:55 -0500)]
Script to convert OMB subscriptions to OStatus subscriptions

14 years agoUpdate pot file
Siebrand Mazeland [Mon, 1 Mar 2010 14:09:44 +0000 (15:09 +0100)]
Update pot file

14 years agofix call of common_find_mentions() in Notice::saveReplies()
Evan Prodromou [Sat, 27 Feb 2010 21:30:38 +0000 (16:30 -0500)]
fix call of common_find_mentions() in Notice::saveReplies()

14 years agoUse notice for context when deciding who @nickname refers to
Evan Prodromou [Sat, 27 Feb 2010 21:06:46 +0000 (16:06 -0500)]
Use notice for context when deciding who @nickname refers to

In a federated system, "@nickname" is insufficient to uniquely
identify a user. However, it's a very convenient idiom. We need to
guess from context who 'nickname' refers to.

Previously, we were using the sender's profile (or what we knew about
them) as the only context. So, we assumed that they'd be mentioning to
someone they followed, or someone who followed them, or someone on
their own server.

Now, we include the notice information for context. We check to see if
the notice is a reply to another notice, and if the author of the
original notice has the nickname 'nickname', then the mention is
probably for them. Alternately, if the original notice mentions someone
with nickname 'nickname', then this notice is probably referring to
_them_.

Doing this kind of context sleuthing means we have to render the
content very late in the notice-saving process.

14 years agoMerge branch 'master' into testing
Evan Prodromou [Sat, 27 Feb 2010 20:05:34 +0000 (15:05 -0500)]
Merge branch 'master' into testing

14 years agoPlugin to restrict too many registrations from one IP
Evan Prodromou [Sat, 27 Feb 2010 20:03:17 +0000 (15:03 -0500)]
Plugin to restrict too many registrations from one IP

We throttle registrations by IP. We record IP address of each
registration, and if too many registrations have been done by the same
IP address in the time interval, we reject the registration.

14 years agoadd bugfix to version number.
Evan Prodromou [Sat, 27 Feb 2010 16:04:24 +0000 (11:04 -0500)]
add bugfix to version number.

14 years agoFixes entity_tags alignment
Sarven Capadisli [Sat, 27 Feb 2010 15:59:33 +0000 (16:59 +0100)]
Fixes entity_tags alignment

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Evan Prodromou [Fri, 26 Feb 2010 23:28:43 +0000 (18:28 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoRevert "change function name"
Evan Prodromou [Fri, 26 Feb 2010 23:28:33 +0000 (18:28 -0500)]
Revert "change function name"

This reverts commit 21edb98a32cf67b9f754c9a74414f113cb71cb37.

14 years agorenaming sha256 to prevent conflict
James Walker [Fri, 26 Feb 2010 23:22:08 +0000 (18:22 -0500)]
renaming sha256 to prevent conflict

14 years agochange function name
Evan Prodromou [Fri, 26 Feb 2010 23:26:52 +0000 (18:26 -0500)]
change function name

14 years agoMerge branch 'testing' of gitorious.org:statusnet/mainline into testing
Zach Copley [Fri, 26 Feb 2010 23:10:45 +0000 (15:10 -0800)]
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  better return check in Magicsig::staticGet()
  blow cache on known replies

14 years agobetter return check in Magicsig::staticGet()
James Walker [Fri, 26 Feb 2010 22:52:12 +0000 (17:52 -0500)]
better return check in Magicsig::staticGet()

14 years agoblow cache on known replies
Evan Prodromou [Fri, 26 Feb 2010 22:47:39 +0000 (17:47 -0500)]
blow cache on known replies

14 years agoPull conversation URL from Conversation instead of assuming it's local
Zach Copley [Fri, 26 Feb 2010 22:47:38 +0000 (14:47 -0800)]
Pull conversation URL from Conversation instead of assuming it's local

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Evan Prodromou [Fri, 26 Feb 2010 22:29:04 +0000 (17:29 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoadd a flag to impede adding sessions to URLs (for permanent stuff)
Evan Prodromou [Fri, 26 Feb 2010 22:28:44 +0000 (17:28 -0500)]
add a flag to impede adding sessions to URLs (for permanent stuff)

14 years agoMagicEnvelope::parse shouldn't be called statically
James Walker [Fri, 26 Feb 2010 22:09:50 +0000 (17:09 -0500)]
MagicEnvelope::parse shouldn't be called statically

14 years agoshould be sequenceKey (singular)
James Walker [Fri, 26 Feb 2010 21:51:50 +0000 (16:51 -0500)]
should be sequenceKey (singular)

14 years agoadding sequenceKeys() to magicsig
James Walker [Fri, 26 Feb 2010 21:50:00 +0000 (16:50 -0500)]
adding sequenceKeys() to magicsig

14 years agoremoving some extraneous debug logging
James Walker [Fri, 26 Feb 2010 21:25:47 +0000 (16:25 -0500)]
removing some extraneous debug logging

14 years agoCheck for conversation with unique conversation ID
Zach Copley [Fri, 26 Feb 2010 21:06:06 +0000 (13:06 -0800)]
Check for conversation with unique conversation ID

14 years agomove salmon posting to send application/magic-envelope+xml per http://salmon-protocol...
James Walker [Fri, 26 Feb 2010 20:39:30 +0000 (15:39 -0500)]
move salmon posting to send application/magic-envelope+xml per http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#RPF

14 years agoDiscovery::lookup now throws an exception
James Walker [Fri, 26 Feb 2010 20:38:48 +0000 (15:38 -0500)]
Discovery::lookup now throws an exception

14 years agoMerge branch 'master' of gitorious.org:statusnet/mainline into testing
Brion Vibber [Fri, 26 Feb 2010 20:33:13 +0000 (12:33 -0800)]
Merge branch 'master' of gitorious.org:statusnet/mainline into testing

14 years agoUpdated ShowGroup to Resolve Aliases Again.
Christopher Vollick [Fri, 26 Feb 2010 15:10:38 +0000 (10:10 -0500)]
Updated ShowGroup to Resolve Aliases Again.

The way we find groups changed with this new Local_group table.
I had to update this too.

14 years agomove signing to take a local actor profile and use local keys
James Walker [Fri, 26 Feb 2010 19:21:21 +0000 (14:21 -0500)]
move signing to take a local actor profile and use local keys

14 years agoonly put public keys in XRD
James Walker [Fri, 26 Feb 2010 18:40:33 +0000 (13:40 -0500)]
only put public keys in XRD

14 years agoupdating to use latest salmon NS definitions
James Walker [Fri, 26 Feb 2010 18:17:24 +0000 (13:17 -0500)]
updating to use latest salmon NS definitions

14 years agoTemp fix for mismatched newlines in Telugu; gettext sometimes refuses to complete...
Brion Vibber [Fri, 26 Feb 2010 17:59:36 +0000 (09:59 -0800)]
Temp fix for mismatched newlines in Telugu; gettext sometimes refuses to complete when such mismatches are present. (Needs to be fixed upstream in TranslateWiki separately so it doesn't revert.)

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Evan Prodromou [Fri, 26 Feb 2010 17:40:59 +0000 (12:40 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoMerge branch 'blacklistplus' into testing
Evan Prodromou [Fri, 26 Feb 2010 17:40:30 +0000 (12:40 -0500)]
Merge branch 'blacklistplus' into testing

Conflicts:
EVENTS.txt

14 years agoMerge branch 'master' into testing
Brion Vibber [Fri, 26 Feb 2010 17:35:08 +0000 (09:35 -0800)]
Merge branch 'master' into testing