summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-19Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-03-19Merge branch 'ostatus-crop' of ↵Brion Vibber
git@gitorious.org:~brion/statusnet/brion-fixes into 0.9.x
2010-03-19Updated biz theme logoSarven Capadisli
2010-03-18Work around weird bug with HTML normalization via PHP DOM module; if source ↵Brion Vibber
had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved.
2010-03-18Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-03-18Handle "forgot to upload an avatar on avatarsettings" a little more gracefully.Brion Vibber
2010-03-18OStatus discover fixes:Brion Vibber
* Subscription::start was sometimes passing users instead of profiles to hooks, which broke OStatus subscription notifications; now normalizing to profiles for processing. * H-card parsing would trigger a lot of PHP warnings and notices in hKit. Now suppressing warnings and notices for the duration of the call to keep them out of output when display_errors is on. * H-card parsing would trigger a PHP fatal error if the source page was not well-formed XML and Tidy was not present on the system. Switched normalization to use the PHP DOM module which is always present, as we have no need for Tidy's extra features here. * Trying to fetch avatars from Google profiles failed and triggered a PHP warning due to the relative URL not being resolved during h-card parsing. Now passing profile page URL into hKit by sneaking a <base> tag in while we normalize the HTML source. * Profile pages without a "Link" header could trigger PHP notices due to a bad NULL -> array(NULL) conversion in LinkHeader::getLink(). Now checking that there was a return value before converting single return value into array.
2010-03-18Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, ↵Craig Andrews
causing warnings) Remove erroneous call to unlink in the constructor
2010-03-18Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
2010-03-18Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* 'testing' of gitorious.org:statusnet/mainline: Fix for xmpp/sms notification options appearing to be disabled on new subscriptions.
2010-03-18API - handle any exceptions thrown during notice save. The API wasZach Copley
occasionally spitting out HTML, which is hard for clients to deal with.
2010-03-18Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, ↵Craig Andrews
causing warnings) Remove erroneous call to unlink in the constructor
2010-03-18Fix notice warning about unused var -- was renamed during refactoring.Brion Vibber
2010-03-18Added processing indicator for more anchorSarven Capadisli
2010-03-18Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
2010-03-18Fix for xmpp/sms notification options appearing to be disabled on new ↵Brion Vibber
subscriptions. Base problem is that our caching-on-insert interferes with relying on column default values; the cached object is missing those fields, so they appear to be empty (null) when the object is retrieved from cache. Now explicitly setting them when inserting subscriptions, and cleaned up some code that had alternate code paths. May also have made auto-subscription work for remote OStatus subscribers, but can't test until magic sigs are working again.
2010-03-18Remove deprecated call-by-reference. Was causing a warning on Dreamhost.Zach Copley
2010-03-18Remove deprecated call-by-reference. Was causing a warning on Dreamhost.Zach Copley
2010-03-18Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-03-18change profile URL ensure method for OStatusEvan Prodromou
2010-03-18Fix some remote subscription regressions from ↵Brion Vibber
f21f78364a9cbde2ca535a3983b384707ad097ae Ostatus_profile::ensureProfile() has been renamed to Ostatus_profile::ensureProfileURL()
2010-03-18Add readme notes about PHP <5.2.6 bug on 64-bit and PHP 5.3 issues.Brion Vibber
2010-03-18Runtime check for known bad PHP versions with 64-bit stream_select() bug in ↵Brion Vibber
xmppdaemon.php.
2010-03-18Merge branch 'master' of git@gitorious.org:statusnet/mainline into testingBrion Vibber
2010-03-18Ensure that DB connection is active at start of User::updateKeys() and ↵Brion Vibber
Foreign_user::updateKeys(); calls to $this->_quote() require a live connection object and don't lazy-initialize themselves. May fix WSOD when changing incoming email address.
2010-03-18Ensure that DB connection is active at start of User::updateKeys() and ↵Brion Vibber
Foreign_user::updateKeys(); calls to $this->_quote() require a live connection object and don't lazy-initialize themselves. May fix WSOD when changing incoming email address.
2010-03-18Sigh... somehow left a stray bit of test code and broke activity.php.Brion Vibber
2010-03-18add exception on inconsistent db to User::getProfile()Evan Prodromou
2010-03-18new exception class for when a user has no profileEvan Prodromou
2010-03-18Using an icon to represent the action for more textSarven Capadisli
2010-03-18Using &#8230; (hellip) instead of "more" for link textSarven Capadisli
2010-03-18reverse order from delete, insert to insert, delete on ostatus conversionEvan Prodromou
2010-03-18catch exceptions in OStatus updates, log, and continueEvan Prodromou
2010-03-17Ticket #2244: fix to interpretation of escaped HTML and plaintext Atom ↵Brion Vibber
content on incoming OStatus messages. We were double-unescaping for <content type="html">, turning &lt;b&gt; escaped chars into literal tags (which then may get removed entirely by the HTML scrubber).
2010-03-17Merge branch 'ostatus-crop' into 0.9.xBrion Vibber
2010-03-18Updated 'more' anchor for attachments to do an XHR GETSarven Capadisli
2010-03-17Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents ↵Brion Vibber
to make it easier to extract without getting extra markup.
2010-03-17Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-17Tweak to OStatus long message cropping: use original source notice URL for ↵Brion Vibber
the link in the text version, don't shorten the link for the HTML so we can append params to it in JS.
2010-03-17Display scrubbed HTML attachments inline on attachment view page.Brion Vibber
2010-03-17When too-long messages come in via OStatus, mark the attachment link up as a ↵Brion Vibber
"more" link in the HTML output, marked with class="attachment more" so JS code can fold it out smartly. Text output will still include the raw link.
2010-03-17Merge branch 'testing' into 0.9.xBrion Vibber
2010-03-17Merge branch 'master' into testingBrion Vibber
2010-03-17Fix to regression for auto-subscribe - was backwards.Brion Vibber
2010-03-17Workaround for HTTP authentication in the API when running PHP as ↵Brion Vibber
CGI/FastCGI. Example rewrite lines added as comments in htaccess.sample, API tweaked to accept alternate environment var form.
2010-03-17Workaround for HTTP authentication in the API when running PHP as ↵Brion Vibber
CGI/FastCGI. Example rewrite lines added as comments in htaccess.sample, API tweaked to accept alternate environment var form.
2010-03-17Pulling the stub plugin panel back out; we'll flesh it out more for 1.0.x ↵Brion Vibber
and see if we can make it easier to disable through the config file for now. Revert "Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list." This reverts commit d9a9fd3779c592e3f4e0a8aea8e385ee2183c0b3.
2010-03-17Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-03-16Pull back for now on switch of PEAR error mode to exceptions; seems to ↵Brion Vibber
trigger out exceptions at various times we don't want them. For instance this was throwing an exception for DB_DataObject::staticGet when there's no match... definitely not what we want when all our code expects to get a nice null. Example of this causing trouble: http://gitorious.org/statusnet/mainline/merge_requests/131 Revert "Don't attempt to retrieve the current user from the DB while processing a DB error" This reverts commit 68347691b0c7fb3f81415abd7fcdc5aec85cc554. Revert "Use PHP exceptions for PEAR error handling." This reverts commit d8212977ce7f911d4f9bd6e55f94aea059a86782.
2010-03-16Pull back for now on switch of PEAR error mode to exceptions; seems to ↵Brion Vibber
trigger out exceptions at various times we don't want them. For instance this was throwing an exception for DB_DataObject::staticGet when there's no match... definitely not what we want when all our code expects to get a nice null. Example of this causing trouble: http://gitorious.org/statusnet/mainline/merge_requests/131 Revert "Don't attempt to retrieve the current user from the DB while processing a DB error" This reverts commit 68347691b0c7fb3f81415abd7fcdc5aec85cc554. Revert "Use PHP exceptions for PEAR error handling." This reverts commit d8212977ce7f911d4f9bd6e55f94aea059a86782.