summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2010-02-25Removed dangling geo iconSarven Capadisli
2010-02-25Added author, license information for the icons that are in base themeSarven Capadisli
2010-02-25Moved common icons from Realtime plugin to core icons fileSarven Capadisli
2010-02-25Added external, play, pause icons to main icons fileSarven Capadisli
2010-02-24recover user_openid tables, which got lost in generationEvan Prodromou
2010-02-24fixup exe bitsEvan Prodromou
2010-02-24Make user_group able to handle remote groupsEvan Prodromou
We add a local_group table to store data about local groups. It has the unique key for nickname, so /group/<nickname> looks up here. Updated DB data object classes and data files.
2010-02-24return attachement from saveHTMLFile()Evan Prodromou
2010-02-24content_* to common_*Evan Prodromou
2010-02-24Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-24if OStatus post is too long, show the summary and save it as an HTML attachmentEvan Prodromou
2010-02-25OStatus: when finding webfinger @-replies, override a local profile match if ↵Brion Vibber
found at the same location (eg @someguy vs @someguy@example.org) Fixes inconsistent application of webfinger @-mentions in OStatus; once a local profile is set up the local name would often match first and ended up overriding in output.
2010-02-25OStatus: abort processing of this PuSH in item if we got an exception, ↵Brion Vibber
rather than letting it be re-run.
2010-02-24Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* 'testing' of gitorious.org:statusnet/mainline: Merge StatusNet core localization updates from 0.9.x branch Fix update_po_templates.php to support the plural and context variants of _m() in plugins Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight. OStatus: handle update-profile Salmon pings Revert "Updated jQuery Form Plugin from v2.17 to v2.36" OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
2010-02-24Populate more profile information when doing a remote subscribeZach Copley
2010-02-24Merge StatusNet core localization updates from 0.9.x branchBrion Vibber
2010-02-24Fix update_po_templates.php to support the plural and context variants of ↵Brion Vibber
_m() in plugins
2010-02-24Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
2010-02-24Drop HTMLPurifier; we don't need its extra capabilities and we're already ↵Brion Vibber
using htmLawed which is lighter-weight.
2010-02-24OStatus: handle update-profile Salmon pingsBrion Vibber
2010-02-25Revert "Updated jQuery Form Plugin from v2.17 to v2.36"Sarven Capadisli
This reverts commit 72037d61436978daa1edbd19d52b7e6fc6ae1fa8. Until some of the XHR notice related bugs are sorted out in Opera and Chromium, reverting back to the previous version. It throws slightly less errors. XHR file attachments is still a bit problematic in Opera 10.10/Ubuntu, Opera 10.10/Windows, and Chrome 4/Ubuntu. But this revert will at least allow regular XHR notices to work okay in Opera and Chromium. Standards suck!
2010-02-24OStatus: disable HTMLPurify cache unless we've configured a writable path ↵Brion Vibber
for it. Updated plugin README with available config options. Cleanup for a bad element fallback lookup in Activity
2010-02-24Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-12-02 16:05:36 +0000