summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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 ↵Brion Vibber
conversation table
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
* 'testing' of gitorious.org:statusnet/mainline: OStatus: if no <link> available and no profileurl hint passed in, use object id if it's an HTTP(S) URL. Fixes profile link for Google accounts. Tweak common_url_to_nickname to take the last path component; fixes pulling nicks from Google profile pages (path is "/profile/<nickname>") Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting profile->getProfile() was masked by DB_DataObject
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
id if it's an HTTP(S) URL. Fixes profile link for Google accounts.
2010-02-25Tweak common_url_to_nickname to take the last path component; fixes pulling ↵Brion Vibber
nicks from Google profile pages (path is "/profile/<nickname>")
2010-02-25Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-25use new dedicated hcard method for Webfinger profileEvan Prodromou
2010-02-25Add an hcard actionEvan Prodromou
A dedicated hcard action for users. Our profile page includes an hcard, but it's so full of other hcards that it's ambiguous which one is the "real" one. So, this one make sense for meaning, "This is my hcard."
2010-02-25Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting ↵Brion Vibber
profile->getProfile() was masked by DB_DataObject
2010-02-25Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* 'testing' of gitorious.org:statusnet/mainline: Not sure how this ended up in wrong-cased dir... OStatus: fix remote groups to work with new user_groups/local_groups split. Conflicts: classes/User_group.php
2010-02-25Rationalize group activity stuffZach Copley
2010-02-25Not sure how this ended up in wrong-cased dir...Brion Vibber
2010-02-25OStatus: fix remote groups to work with new user_groups/local_groups split.Brion Vibber
- fix <activity:subject> generation so we get the profile info (what's available so far) - use id instead of nickname for group join/leave forms so we can join/leave remote groups while the rest of the groups UI remains limited to local groups (plugins are responsible for making sure remote notifications and permission checks are done) - fix remote notification when joining group through OStatus's remote subscribe form
2010-02-25Add local_group.sql with DB changes to user_group, setup and populate ↵Brion Vibber
local_group.
2010-02-25Merge branch 'master' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-02-25Normalize nickname case on login; fixes failed logins where people were ↵Brion Vibber
typing MixedCase nicknames (if browser saved this form, it would never work again until clearing the saved form data; very icky.)
2010-02-25Merge branch 'testing' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-02-25OStatus: save categories from the Atom entry as hashtags.Brion Vibber
2010-02-25Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-25Ensure that shortened URLs haven't accumulated whitespace when fetched by a ↵Brion Vibber
plugin. Some shorteners have ended up inserting extra newlines when the string gets extracted from tidied HTML.
2010-02-25Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-25Merge branch 'master' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-02-25method for getting a group's URIEvan Prodromou
2010-02-25Merge commit 'refs/merge-requests/122' of ↵Brion Vibber
git://gitorious.org/statusnet/mainline into integration
2010-02-25Merge commit 'refs/merge-requests/121' of ↵Brion Vibber
git://gitorious.org/statusnet/mainline into integration
2010-02-25Merge commit 'refs/merge-requests/2220' of ↵Brion Vibber
git://gitorious.org/statusnet/mainline into integration
2010-02-25Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-25save mainpage element for groupsEvan Prodromou
2010-02-25Add 'mainpage' to User_groupEvan Prodromou
Add the mainpage attribute to user_group objects.
2010-02-25Removed dangling icons in Realtime pluginSarven Capadisli
2010-02-25Fixes replyto JS after the upgrade from jQuery 1.4.2Sarven Capadisli
2010-02-25Updated jQuery JavaScript Library from v1.4.1 to v1.4.2Sarven Capadisli
2010-02-25modify group actions so they use Local_group to look up by nicknameEvan Prodromou
2010-02-25Moved otalk theme out of core. It will be updated separately and maySarven Capadisli
be reintruced back to core when appropriate.
2010-02-25Updated pigeonthoughts themeSarven Capadisli
2010-02-25Updated cloudy themeSarven Capadisli