summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-01Also extract _m() used in core.Siebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-01Update pot file.Siebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-02-27Merge branch 'testing' into 0.9.xEvan Prodromou
2010-02-27fix call of common_find_mentions() in Notice::saveReplies()Evan Prodromou
2010-02-27Use notice for context when deciding who @nickname refers toEvan Prodromou
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.
2010-02-27Merge branch 'master' into testingEvan Prodromou
2010-02-27Plugin to restrict too many registrations from one IPEvan Prodromou
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.
2010-02-27uri -> URI in interface textSiebrand Mazeland
2010-02-27Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-02-27add bugfix to version number.Evan Prodromou
2010-02-27Fixes entity_tags alignmentSarven Capadisli
2010-02-26Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-26Revert "change function name"Evan Prodromou
This reverts commit 21edb98a32cf67b9f754c9a74414f113cb71cb37.
2010-02-26renaming sha256 to prevent conflictJames Walker
2010-02-26change function nameEvan Prodromou
2010-02-26Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* 'testing' of gitorious.org:statusnet/mainline: better return check in Magicsig::staticGet() blow cache on known replies
2010-02-26better return check in Magicsig::staticGet()James Walker
2010-02-26blow cache on known repliesEvan Prodromou
2010-02-26Pull conversation URL from Conversation instead of assuming it's localZach Copley
2010-02-26Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-26add a flag to impede adding sessions to URLs (for permanent stuff)Evan Prodromou
2010-02-26MagicEnvelope::parse shouldn't be called staticallyJames Walker
2010-02-26should be sequenceKey (singular)James Walker
2010-02-26adding sequenceKeys() to magicsigJames Walker
2010-02-26nicknamize the requested nickname during autoregistrationCraig Andrews
2010-02-26removing some extraneous debug loggingJames Walker
2010-02-26Check for conversation with unique conversation IDZach Copley
2010-02-26Show messaging on the login and registration forms informing users that they ↵Craig Andrews
may use their LDAP credentials
2010-02-26bail out if the requested nickname is illegalCraig Andrews
2010-02-26move salmon posting to send application/magic-envelope+xml per ↵James Walker
http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#RPF
2010-02-26Discovery::lookup now throws an exceptionJames Walker
2010-02-26Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-02-26Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-02-26Merge branch 'master' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-02-26Updated ShowGroup to Resolve Aliases Again.Christopher Vollick
The way we find groups changed with this new Local_group table. I had to update this too.
2010-02-26move signing to take a local actor profile and use local keysJames Walker
2010-02-26only put public keys in XRDJames Walker
2010-02-26updating to use latest salmon NS definitionsJames Walker
2010-02-26Temp fix for mismatched newlines in Telugu; gettext sometimes refuses to ↵Brion Vibber
complete when such mismatches are present. (Needs to be fixed upstream in TranslateWiki separately so it doesn't revert.)
2010-02-26Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-26Merge branch 'blacklistplus' into testingEvan Prodromou
Conflicts: EVENTS.txt
2010-02-26Merge branch 'testing' into 0.9.xBrion Vibber
2010-02-26Merge branch 'master' into testingBrion Vibber
2010-02-26Blacklist user nickname and password on deleteEvan Prodromou
2010-02-26'on' is what checkboxes use for boolean trueEvan Prodromou
2010-02-26don't choke on dupelimit in createsim.phpEvan Prodromou
2010-02-26Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-26Fixed object nameMichele
2010-02-26more cleanupJames Walker
2010-02-26bad merge.. cleaning up missing webfinger bitsJames Walker