Zach Copley
051bee988c
Minor syntax err in TwitterBridge README example
2010-03-18 17:00:37 -07:00
Craig Andrews
26ba430ae8
Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
...
Remove erroneous call to unlink in the constructor
2010-03-18 15:39:06 -07:00
Brion Vibber
b149b88953
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-18 15:39:04 -07:00
Zach Copley
109aac3c49
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Fix for xmpp/sms notification options appearing to be disabled on new subscriptions.
2010-03-18 15:28:21 -07:00
Zach Copley
e10d023d03
API - handle any exceptions thrown during notice save. The API was
...
occasionally spitting out HTML, which is hard for clients to deal
with.
2010-03-18 15:26:13 -07:00
Craig Andrews
9c5af9a38f
Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
...
Remove erroneous call to unlink in the constructor
2010-03-18 18:13:54 -04:00
Brion Vibber
c8e3d08a8f
Fix notice warning about unused var -- was renamed during refactoring.
2010-03-18 15:11:25 -07:00
Sarven Capadisli
7dd701fbb3
Added processing indicator for more anchor
2010-03-18 23:00:38 +01:00
Brion Vibber
69b25ba1be
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-18 14:33:45 -07:00
Brion Vibber
cac9d23498
Fix for xmpp/sms notification options appearing to be disabled on new 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-18 14:26:32 -07:00
Zach Copley
54c6dc090b
Remove deprecated call-by-reference. Was causing a warning on Dreamhost.
2010-03-18 13:49:28 -07:00
Zach Copley
c09db79b95
Remove deprecated call-by-reference. Was causing a warning on Dreamhost.
2010-03-18 13:46:11 -07:00
Evan Prodromou
dbd44e51a2
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-18 15:21:43 -05:00
Evan Prodromou
2ccd5187cc
change profile URL ensure method for OStatus
2010-03-18 15:21:26 -05:00
Brion Vibber
f1b3d84b7d
Fix some remote subscription regressions from f21f78364a
...
Ostatus_profile::ensureProfile() has been renamed to Ostatus_profile::ensureProfileURL()
2010-03-18 13:13:57 -07:00
Brion Vibber
bbfb766885
Add readme notes about PHP <5.2.6 bug on 64-bit and PHP 5.3 issues.
2010-03-18 11:12:27 -07:00
Brion Vibber
0fe82bd0c9
Runtime check for known bad PHP versions with 64-bit stream_select() bug in xmppdaemon.php.
2010-03-18 11:08:27 -07:00
Brion Vibber
1de7badd78
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-18 10:55:20 -07:00
Brion Vibber
515cdf28a8
Ensure that DB connection is active at start of User::updateKeys() and 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-18 09:24:55 -07:00
Brion Vibber
85b93310dd
Ensure that DB connection is active at start of User::updateKeys() and 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-18 09:22:08 -07:00
Brion Vibber
d115932466
Sigh... somehow left a stray bit of test code and broke activity.php.
2010-03-18 09:10:44 -07:00
Evan Prodromou
425ddcaa26
add exception on inconsistent db to User::getProfile()
2010-03-18 08:35:10 -05:00
Evan Prodromou
0a1b10114b
new exception class for when a user has no profile
2010-03-18 08:32:17 -05:00
Sarven Capadisli
e2768b8635
Using an icon to represent the action for more text
2010-03-18 14:29:35 +01:00
Sarven Capadisli
052466ceab
Using … (hellip) instead of "more" for link text
2010-03-18 14:26:30 +01:00
Evan Prodromou
a764603e73
reverse order from delete, insert to insert, delete on ostatus conversion
2010-03-18 08:04:22 -05:00
Evan Prodromou
f1af583e3e
catch exceptions in OStatus updates, log, and continue
2010-03-18 07:55:14 -05:00
Brion Vibber
55a54d6f6a
Ticket #2244 : fix to interpretation of escaped HTML and plaintext Atom content on incoming OStatus messages.
...
We were double-unescaping for <content type="html">, turning <b> escaped chars into literal tags (which then may get removed entirely by the HTML scrubber).
2010-03-17 17:35:27 -07:00
Brion Vibber
5d1295f233
Merge branch 'ostatus-crop' into 0.9.x
2010-03-17 16:41:01 -07:00
Sarven Capadisli
d8a533274f
Updated 'more' anchor for attachments to do an XHR GET
2010-03-18 00:19:32 +01:00
Brion Vibber
dc71833ce6
Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents to make it easier to extract without getting extra markup.
2010-03-17 15:49:10 -07:00
Siebrand Mazeland
3255f9d9cf
Localisation updates for !StatusNet from !translatewiki.net !sntrans
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-17 22:44:38 +01:00
Brion Vibber
a9c731798e
Tweak to OStatus long message cropping: use original source notice URL for 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-17 14:16:43 -07:00
Brion Vibber
f797a10256
Display scrubbed HTML attachments inline on attachment view page.
2010-03-17 13:58:25 -07:00
Brion Vibber
3a72c70b7e
When too-long messages come in via OStatus, mark the attachment link up as a "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-17 12:34:35 -07:00
Brion Vibber
67f2f01c5e
Merge branch 'testing' into 0.9.x
2010-03-17 12:15:40 -07:00
Brion Vibber
ca5612c451
Merge branch 'master' into testing
2010-03-17 12:15:12 -07:00
Brion Vibber
dacd0f3e6d
Fix to regression for auto-subscribe - was backwards.
2010-03-17 12:14:19 -07:00
Brion Vibber
22f827134c
Workaround for HTTP authentication in the API when running PHP as CGI/FastCGI. Example rewrite lines added as comments in htaccess.sample, API tweaked to accept alternate environment var form.
2010-03-17 11:04:41 -07:00
Brion Vibber
1c942afa60
Workaround for HTTP authentication in the API when running PHP as CGI/FastCGI. Example rewrite lines added as comments in htaccess.sample, API tweaked to accept alternate environment var form.
2010-03-17 10:52:11 -07:00
Brion Vibber
b9fc4c24b4
Pulling the stub plugin panel back out; we'll flesh it out more for 1.0.x 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 d9a9fd3779
2010-03-17 08:55:16 -07:00
Evan Prodromou
4761c07ad8
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-17 09:38:39 -05:00
Brion Vibber
f62b8a80cf
Pull back for now on switch of PEAR error mode to exceptions; seems to 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 68347691b0d8212977ce
2010-03-16 16:32:25 -07:00
Brion Vibber
88f66131a1
Pull back for now on switch of PEAR error mode to exceptions; seems to 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 68347691b0d8212977ce
2010-03-16 16:24:31 -07:00
Brion Vibber
d9a9fd3779
Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list.
2010-03-16 16:01:00 -07:00
Sarven Capadisli
910108b9ae
Removed unnecessary form_id. Using jQuery .find() instead of
...
constructing the selector.
2010-03-16 21:02:56 +01:00
Sarven Capadisli
e8c7873b79
Added extra condition to focusing on notice form on page load. If the
...
window location contains a fragument identifier, it will skip focus
and do what the UA does natively.
2010-03-16 20:53:49 +01:00
Sarven Capadisli
0be70e390b
Removed dangling stylesheet
2010-03-16 19:34:20 +01:00
Evan Prodromou
f21f78364a
Change the workflow to get better discovery
...
Tried to re-structure the workflow of discovery to get more and richer
data and hints.
2010-03-16 11:25:18 -05:00
Jeffery To
8a9b3a858b
Fixed "Warning: syslog() expects parameter 1 to be long, string given"
...
With the FirePHP plugin enabled, I get these warnings in the output
page. This is because the StartLog handler inadvertly modifies the
original (number) priority with the corresponding (string) FirePHP
priority.
2010-03-16 11:44:51 -04:00
