summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2010-02-26Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-02-26Merge branch 'testing' into 0.9.xBrion Vibber
2010-02-26Merge branch 'master' into testingBrion Vibber
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
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
2010-02-25OStatus: clean up known-URL hinting during profile setup, saves some extra HT...Brion Vibber
2010-02-25add beta5 to beta6 scriptEvan Prodromou
2010-02-25Fix test to account for new way avatars are stored in ActivityObjectZach Copley
2010-02-25Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
2010-02-25- Updates to use new activity object factoriesZach Copley
2010-02-25Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-25remove linkback from default pluginsEvan Prodromou
2010-02-25Merge branch 'testing' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-02-25OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, oth...Brion Vibber
2010-02-25Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-25Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
2010-02-25Fix atom feed IDs in user and group atom feedsZach Copley
2010-02-25Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-25info about discovery in Ostatus_profile::ensureWebfinger()Evan Prodromou
2010-02-25cache Web responses in Webfinger libraryEvan Prodromou
2010-02-25Set avatar height correctlyZach Copley
2010-02-25init_conversation.php script to copy old notice conversations into the conver...Brion Vibber
2010-02-25cache results of webfinger lookupsEvan Prodromou
2010-02-25Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-25Parse an hcard for hints, if availableEvan Prodromou
2010-02-25use new hcard method for webfingerEvan Prodromou
2010-02-25add hkit for hCard parsingEvan Prodromou
2010-02-25Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
2010-02-25Add lots of fun avatars to our Atom outputZach Copley
2010-02-26OStatus: if no <link> available and no profileurl hint passed in, use object ...Brion Vibber
2010-02-25Tweak common_url_to_nickname to take the last path component; fixes pulling n...Brion Vibber
2010-02-25Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou