summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
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
2010-02-25OStatus: clean up known-URL hinting during profile setup, saves some extra ↵Brion Vibber
HTTP hits we were getting when mentioning Buzz feeds.
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
* 'testing' of gitorious.org:statusnet/mainline: OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first) info about discovery in Ostatus_profile::ensureWebfinger() cache Web responses in Webfinger library
2010-02-25- Updates to use new activity object factoriesZach Copley
- Prune obsolete feed creation method
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, ↵Brion Vibber
otherwise if none labeled takes the first)
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
* 'testing' of gitorious.org:statusnet/mainline: init_conversation.php script to copy old notice conversations into the conversation table cache results of webfinger lookups Parse an hcard for hints, if available use new hcard method for webfinger add hkit for hCard parsing use new dedicated hcard method for Webfinger profile Add an hcard action
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