summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-02-24Merge branch '0.9.x' into 1.0.xCraig Andrews
Conflicts: EVENTS.txt db/statusnet.sql lib/queuemanager.php
2010-02-24Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-02-24Fix update_po_templates.php to support the plural and context variants of ↵Brion Vibber
_m() in plugins
2010-02-25Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-02-24Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-02-24Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
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
2010-02-24use Notice::bestUrl() to determine notice url in ↵Evan Prodromou
NoticeListItem::showNoticeLink()
2010-02-24Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
2010-02-24- break OMB profile update pings to a background queueBrion Vibber
- add event hooks to profile update pings - send Salmon pings with custom update-profile event to OStatus subscribees and groups (subscribers will see it on your next post) - fix OStatus queues with overlong transport names, should work on DB queues now - Ostatus_profile::notifyActivity() and ::notifyDeferred() now can take XML, Notice, or Activity for convenience
2010-02-24use Subscription::start() for remote subscribesEvan Prodromou
2010-02-24Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-02-24OStatus: save updated profile bits when they come in over the wire; fix up ↵Brion Vibber
nicknames
2010-02-24Include <author> with actor ID and name in Activity::asString(); fixes ↵Brion Vibber
Salmon signature on OStatus unsub pings
2010-02-24Added a cookie for the nickname cookie for the login page and prefillSarven Capadisli
the input field.
2010-02-24Moved StatusNetInstance into SN in util.jsSarven Capadisli
2010-02-24Added processing indicator for .form_remote_authorize on ostatussub pageSarven Capadisli
2010-02-24Break long strings in tagcloudSarven Capadisli
2010-02-23- Move ActivityParseTests to coreZach Copley
- Add test for Portable Contacts stuff
2010-02-23Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* 'testing' of gitorious.org:statusnet/mainline: OStatus: fix group delivery, send reply/group Salmon pings from background.
2010-02-23Add PoCo parsing and some other fixes.Zach Copley
2010-02-24OStatus: fix group delivery, send reply/group Salmon pings from background.Brion Vibber
2010-02-24Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
2010-02-24OStatus: consolidate the low-level notice save code between Salmon and PuSH ↵Brion Vibber
input paths. Validation etc remains at higher levels.
2010-02-24Add class and (if present) id to DB_DataObject error exceptions; often ↵Brion Vibber
they're VERRRRRY vague, and it helps to know what type of item is failing!
2010-02-24Using the default abbr class pattern for geo microformats instead ofSarven Capadisli
the shorthand that I've proposed at http://microformats.org/wiki/geo-brainstorming#latitude_longitude_shorthand_and_geo_link If anyone wants to pick up on where the discussion was left off or get more implementation support by other sites and software, and be recognized by parsers, I'd be happy to go back to the shorthand. Because you know, it actually makes a lot of sense.
2010-02-23adding xfn, foaf and hcard rel's to our webfinger outputJames Walker
2010-02-23Add poco:displayName to Atom output for person objectZach Copley
2010-02-23OStatus: fixes for link/id and text extraction gets import of Buzz feeds ↵Brion Vibber
working.
2010-02-23some logging for OStatusPlugin::onStartFindMentions()Evan Prodromou
2010-02-23OStatus: accept webfinger addresses as well as profile URLs in the explicit ↵Brion Vibber
remote subscribe form.
2010-02-23Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
Conflicts: plugins/OStatus/OStatusPlugin.php
2010-02-23move mention detection before default in OStatusPluginEvan Prodromou
2010-02-23OStatus: do PuSH subscription setup from subscribe/join event hooks, so ↵Brion Vibber
resubscribing directly from a profile/group list works correctly if there aren't active subscriptions at the moment.
2010-02-23OStatus subscription UI tweak: if we're already subscribed/joined, say so ↵Brion Vibber
and don't offer a 'subscribe'/'join' button on the profile preview page.
2010-02-23OStatus: fix for avatars, submit button in updated remote profile previewBrion Vibber
2010-02-23Drop user-only requirement for subscribe actionEvan Prodromou
I removed the check for local users in the subscribe button. I replaced it with a more specific check for OMB 0.1 remote profiles, which you can't use with this action. I also took the opportunity to split the handle() method into prepare() and handle(), and added PHPCS clean documentation.
2010-02-22er typoJames Walker
2010-02-22magicsig shufflingJames Walker
2010-02-22clean up error loggingJames Walker
2010-02-22missing return value checkJames Walker
2010-02-22generate keypairs for users, and put them in the XRD for discoveryJames Walker
2010-02-22db_objectified magic sig - for persistence of local keypairsJames Walker
2010-02-22moving magicsig.php to classes - to add storageJames Walker
2010-02-22Add lose <nickname> command to the command interpreterCraig Andrews