summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-26removing some extraneous debug loggingJames Walker
2010-02-26Check for conversation with unique conversation IDZach Copley
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 '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 '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
2010-02-26remove webfinger.phpJames Walker
2010-02-26Merge remote branch 'statusnet/testing' into testingJames Walker
2010-02-26salmon actually fetching remote keypairsJames Walker
2010-02-25Remove unnecessary requiresZach Copley
2010-02-25Get ApiAction autoloading properlyZach Copley
2010-02-25Remove unnecessary requiresZach Copley
2010-02-25Get ApiAction autoloading properlyZach Copley
2010-02-25Fix a few keys that got dropped from statusnet.ini by mistakeBrion Vibber
2010-02-25Fix for group timeline feeds by nameBrion Vibber
2010-02-25try/catch on omb profile pingsBrion Vibber
2010-02-25try/catch on omb profile pingsBrion Vibber
2010-02-25Merge remote branch 'statusnet/testing' into testingJames Walker
Conflicts: plugins/OStatus/lib/webfinger.php
2010-02-25use a real keypair from discoveryJames Walker
2010-02-25er. right.James Walker
2010-02-25update to beta6Evan Prodromou
2010-02-25Merge branch 'testing' of gitorious.org:statusnet/mainline into testingBrion Vibber
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-09-19 13:11:24 +0000