]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
14 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Fri, 19 Nov 2010 23:38:20 +0000 (15:38 -0800)]
Merge branch 'master' into 0.9.x

14 years agoTicket #2796: don't allow arbitrary overriding of the 'action' class and other parame...
Brion Vibber [Fri, 19 Nov 2010 23:30:52 +0000 (15:30 -0800)]
Ticket #2796: don't allow arbitrary overriding of the 'action' class and other parameters pulled from the URL mapper.

This protects against oddities such as manual invocation of the ClientError action, which can spoof error messages.

14 years agoTicket #2797: replace addslashes() with explicit escape calls on the DB objects
Brion Vibber [Fri, 19 Nov 2010 23:06:26 +0000 (15:06 -0800)]
Ticket #2797: replace addslashes() with explicit escape calls on the DB objects

14 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Fri, 19 Nov 2010 22:03:59 +0000 (14:03 -0800)]
Merge branch 'master' into 0.9.x

14 years agoTicket #1987: support since_id on API notice search methods.
Brion Vibber [Fri, 19 Nov 2010 22:00:22 +0000 (14:00 -0800)]
Ticket #1987: support since_id on API notice search methods.

max_id is not yet implemented, as it'll need support added to the search backends. (since_id we get 'for free' by just cropping off the list, it'll do for now)

14 years agoMerge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Fri, 19 Nov 2010 20:44:43 +0000 (12:44 -0800)]
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

14 years agoTicket #2441: fix deletion of avatars when a profile is deleted.
Brion Vibber [Fri, 19 Nov 2010 20:39:07 +0000 (12:39 -0800)]
Ticket #2441: fix deletion of avatars when a profile is deleted.

Code was doing a batch call to $avatar->delete() which fails to properly engage the file deletion code. Calling the existing profile->delete_avatars() function deletes them individually, which makes it all work nice again.

14 years agoDrop PEAR HTTP_Request library -- no longer used since Services_oEmbed was dropped.
Brion Vibber [Fri, 19 Nov 2010 20:15:28 +0000 (12:15 -0800)]
Drop PEAR HTTP_Request library -- no longer used since Services_oEmbed was dropped.

(HTTP_Request2 is separate and is widely used. Net_URL is also used separately by Net_URL_Mapper.)

14 years agoMerge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Fri, 19 Nov 2010 20:00:42 +0000 (12:00 -0800)]
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

14 years agoTicket #2899: clean up inbox/outbox DM form a bit:
Brion Vibber [Fri, 19 Nov 2010 19:56:03 +0000 (11:56 -0800)]
Ticket #2899: clean up inbox/outbox DM form a bit:
- "To" drop-down list now defaults to showing "Select recipient:" instead of the first person on your list, reducing liklihood of accidentally sending a message to the wrong person.
- When there are no mutual subscribers to send to, instead of an empty list the list now shows 'No mutual subscribers.'

In both cases, attempting to send when the default is selected displays an error message.
I'm not disabling form elements in part because our themes right now don't show disabled button state correctly; we might want to tighten that up a bit more once fixed.

14 years agoMerge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Fri, 19 Nov 2010 18:43:20 +0000 (10:43 -0800)]
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

14 years agoAutomatically make Facebook admin panel available if the FacebookBridge
Zach Copley [Fri, 19 Nov 2010 05:55:43 +0000 (21:55 -0800)]
Automatically make Facebook admin panel available if the FacebookBridge
plugin is installed.

14 years agoscripts/deletegroup.php -- basic CLI script to delete a group by id or local nickname...
Brion Vibber [Thu, 18 Nov 2010 22:40:05 +0000 (14:40 -0800)]
scripts/deletegroup.php -- basic CLI script to delete a group by id or local nickname. Like deleteuser.php, this can be used in batch runs by providing the -y override.

14 years agoFix regression in PopularNoticeSection: tag parameter was broken, causing sidebar...
Brion Vibber [Thu, 18 Nov 2010 22:30:00 +0000 (14:30 -0800)]
Fix regression in PopularNoticeSection: tag parameter was broken, causing sidebar on tag pages to show untagged favorites.

14 years agoFacebook: Add needed perms to plain login URL
Zach Copley [Thu, 18 Nov 2010 21:34:41 +0000 (13:34 -0800)]
Facebook: Add needed perms to plain login URL

14 years agoFix name of Facebook Bridge plugin
Zach Copley [Thu, 18 Nov 2010 21:28:49 +0000 (13:28 -0800)]
Fix name of Facebook Bridge plugin

14 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Thu, 18 Nov 2010 00:13:40 +0000 (16:13 -0800)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

14 years agoPartial fix for tickets #2194, #2393: Workaround for Meteor breaking AJAX error respo...
Brion Vibber [Wed, 17 Nov 2010 22:24:35 +0000 (14:24 -0800)]
Partial fix for tickets #2194, #2393: Workaround for Meteor breaking AJAX error responses returned on posting new notices. Fixes things in Firefox 4, but Safari 5 and Chrome 8 still don't return data... either on success or failure! Sigh.

The Meteor realtime plugin sets document.domain to the common prefix between the main server and the Meteor server's hostnames, which overrides the same-origin controls on JavaScript DOM access so the two parts of the app can speak to each other.
This unfortunately causes "fun" side effects for XMLHTTPRequest access to the main domain... if the new domain doesn't match the actual host (eg 'status.net' instead of 'brion.status.net') then we can't access the XHR's responseXML attribute, which holds a DOM tree of the parsed XML return data.
As a workaround, if we can't get at the contents there, we'll parse a fresh DOM tree in the local context from the responseText property, which remains available.

In the longer term, recommend retooling the realtime stuff so it's not fiddling with document.domain. It could also be an issue as it could allow local JavaScript XSS attacks to migrate to subdomains in other open windows.

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Wed, 17 Nov 2010 22:16:08 +0000 (22:16 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoRemove dumb debugging statement
Zach Copley [Wed, 17 Nov 2010 22:15:30 +0000 (22:15 +0000)]
Remove dumb debugging statement

14 years agoFacebook: Gracefully handle disconnection
Zach Copley [Wed, 17 Nov 2010 21:53:56 +0000 (21:53 +0000)]
Facebook: Gracefully handle disconnection

14 years agoAdd $config['attachments']['process_links'] to allow disabling processing of mentione...
Brion Vibber [Wed, 17 Nov 2010 21:03:59 +0000 (13:03 -0800)]
Add $config['attachments']['process_links'] to allow disabling processing of mentioned URL links for attachment info (oEmbed lookups) and dereferencing of redirects that we didn't have shortened ourselves.

This option may be useful for intranet sites that don't have direct access to the internet, as they may be unable to successfully fetch those resources.

14 years agoinclude full updated source of JSON2 and use updated minified version
Evan Prodromou [Wed, 17 Nov 2010 17:34:04 +0000 (12:34 -0500)]
include full updated source of JSON2 and use updated minified version

14 years agouse minified version of jquery.cookie.js
Evan Prodromou [Wed, 17 Nov 2010 17:32:11 +0000 (12:32 -0500)]
use minified version of jquery.cookie.js

14 years agouse minified version of jquery.form.js
Evan Prodromou [Wed, 17 Nov 2010 17:31:35 +0000 (12:31 -0500)]
use minified version of jquery.form.js

14 years agoupgrade jquery.form.js
Evan Prodromou [Wed, 17 Nov 2010 17:30:55 +0000 (12:30 -0500)]
upgrade jquery.form.js

14 years agouse minified version of meteorupdater.js
Evan Prodromou [Wed, 17 Nov 2010 17:22:02 +0000 (12:22 -0500)]
use minified version of meteorupdater.js

14 years agouse minified version of realtime.js
Evan Prodromou [Wed, 17 Nov 2010 17:21:01 +0000 (12:21 -0500)]
use minified version of realtime.js

14 years agoMerge branch '0.9.x' into minifyjs
Evan Prodromou [Wed, 17 Nov 2010 17:19:19 +0000 (12:19 -0500)]
Merge branch '0.9.x' into minifyjs

14 years agomove EndScriptMessages event into if block
Evan Prodromou [Wed, 17 Nov 2010 17:19:01 +0000 (12:19 -0500)]
move EndScriptMessages event into if block

14 years agoUse minified version of util.js
Evan Prodromou [Wed, 17 Nov 2010 17:16:50 +0000 (12:16 -0500)]
Use minified version of util.js

14 years agoupgrade to JQuery 1.4.4
Evan Prodromou [Wed, 17 Nov 2010 17:14:50 +0000 (12:14 -0500)]
upgrade to JQuery 1.4.4

14 years agoUse session token protection on oEmbed proxy action for LinkPreview... and commit...
Brion Vibber [Tue, 16 Nov 2010 23:36:53 +0000 (15:36 -0800)]
Use session token protection on oEmbed proxy action for LinkPreview... and commit the file *sigh*

14 years agoLinkPreview: clear preview thumbnails & data on form submission/reset
Brion Vibber [Tue, 16 Nov 2010 23:31:03 +0000 (15:31 -0800)]
LinkPreview: clear preview thumbnails & data on form submission/reset

14 years agoLess redrawing of bits in the link thumbnail preview
Brion Vibber [Tue, 16 Nov 2010 23:20:37 +0000 (15:20 -0800)]
Less redrawing of bits in the link thumbnail preview

14 years agoLinkPreview: restructure to make it easier to keep old link data
Brion Vibber [Tue, 16 Nov 2010 22:57:35 +0000 (14:57 -0800)]
LinkPreview: restructure to make it easier to keep old link data

14 years agoLinkPreview: use a local proxy for oEmbed lookups so we use a consistent common code...
Brion Vibber [Tue, 16 Nov 2010 22:41:30 +0000 (14:41 -0800)]
LinkPreview: use a local proxy for oEmbed lookups so we use a consistent common code path, and don't open up to oohembed.com being evil

14 years agoLinkPreview: restructure a bit so we can pass config over
Brion Vibber [Tue, 16 Nov 2010 22:27:01 +0000 (14:27 -0800)]
LinkPreview: restructure a bit so we can pass config over

14 years agoLinkPreview: piggyback on the counter update logic, cache lookups.
Brion Vibber [Tue, 16 Nov 2010 22:16:23 +0000 (14:16 -0800)]
LinkPreview: piggyback on the counter update logic, cache lookups.

14 years agoLinkPreview: link the thumbnails
Brion Vibber [Tue, 16 Nov 2010 21:58:22 +0000 (13:58 -0800)]
LinkPreview: link the thumbnails

14 years agoLinkPreview plugin more or less functioning (though not pretty), using oohembed remot...
Brion Vibber [Tue, 16 Nov 2010 21:49:23 +0000 (13:49 -0800)]
LinkPreview plugin more or less functioning (though not pretty), using oohembed remote lookup and fixed sizes.

14 years agoLinkPreview: flesh out stub JS code a bit. URL splitting doesn't quite match core...
Brion Vibber [Tue, 16 Nov 2010 21:16:25 +0000 (13:16 -0800)]
LinkPreview: flesh out stub JS code a bit. URL splitting doesn't quite match core, note.

14 years agoStub LinkPreview plugin
Brion Vibber [Tue, 16 Nov 2010 20:41:35 +0000 (12:41 -0800)]
Stub LinkPreview plugin

14 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Tue, 16 Nov 2010 19:17:29 +0000 (11:17 -0800)]
Merge branch 'master' into 0.9.x

14 years agoTicket 2895: exclude silenced users from popular notice lists
Brion Vibber [Tue, 16 Nov 2010 19:13:52 +0000 (11:13 -0800)]
Ticket 2895: exclude silenced users from popular notice lists

14 years agoPrep for ticket #2895: consolidate common code from PopularNoticeList and FavoritedAc...
Brion Vibber [Tue, 16 Nov 2010 19:10:32 +0000 (11:10 -0800)]
Prep for ticket #2895: consolidate common code from PopularNoticeList and FavoritedAction for fetching popular notice lists

14 years agoFix syntax error
Zach Copley [Tue, 16 Nov 2010 06:10:49 +0000 (06:10 +0000)]
Fix syntax error

14 years agoStore the current user in the CurrentUserDesignAction
Zach Copley [Tue, 16 Nov 2010 02:48:22 +0000 (18:48 -0800)]
Store the current user in the CurrentUserDesignAction

14 years agoFacebookSSO -> FacebookBridge
Zach Copley [Tue, 16 Nov 2010 02:33:17 +0000 (02:33 +0000)]
FacebookSSO -> FacebookBridge

14 years agoMerge branch '0.9.x' into facebook-upgrade
Zach Copley [Tue, 16 Nov 2010 02:32:46 +0000 (02:32 +0000)]
Merge branch '0.9.x' into facebook-upgrade

14 years ago- Map notices to Facebook stream items
Zach Copley [Tue, 16 Nov 2010 02:30:08 +0000 (02:30 +0000)]
- Map notices to Facebook stream items
- rename plugin FacebookBridgePlugin
- delete/like/unlike notices across the bridge

14 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Tue, 16 Nov 2010 01:46:43 +0000 (17:46 -0800)]
Merge branch 'master' into 0.9.x

14 years agoForgot to commit the JS for ModPlus. :)
Brion Vibber [Tue, 16 Nov 2010 01:45:58 +0000 (17:45 -0800)]
Forgot to commit the JS for ModPlus. :)

14 years agoMerge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Tue, 16 Nov 2010 01:36:48 +0000 (17:36 -0800)]
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

14 years agovisual cleanup on ModPlus remote profile info popup menu
Brion Vibber [Tue, 16 Nov 2010 01:32:33 +0000 (17:32 -0800)]
visual cleanup on ModPlus remote profile info popup menu

14 years agoTweak remote profile action: hide stats from sidebar, tweak wording on remote notice
Brion Vibber [Tue, 16 Nov 2010 00:38:18 +0000 (16:38 -0800)]
Tweak remote profile action: hide stats from sidebar, tweak wording on remote notice

14 years agoRemoteProfileAction cleanup:
Brion Vibber [Tue, 16 Nov 2010 00:12:16 +0000 (16:12 -0800)]
RemoteProfileAction cleanup:
- meta robots to prevent spidering
- a little notice if silenced

14 years agovisual tweaks for RemoteProfileAction
Brion Vibber [Mon, 15 Nov 2010 23:57:57 +0000 (15:57 -0800)]
visual tweaks for RemoteProfileAction

14 years agoRemoteProfileAction: redirect to the regular user profile page if given a local user.
Brion Vibber [Mon, 15 Nov 2010 23:40:07 +0000 (15:40 -0800)]
RemoteProfileAction: redirect to the regular user profile page if given a local user.

14 years agoWorkaround for display of Twitter remote users in remoteprofile (ModPlus plugin)...
Brion Vibber [Mon, 15 Nov 2010 23:39:42 +0000 (15:39 -0800)]
Workaround for display of Twitter remote users in remoteprofile (ModPlus plugin): use 73px avatar if no 96px present

14 years agoStub RemoteprofileAction to show the standard profile header stuff for offsite users...
Brion Vibber [Mon, 15 Nov 2010 23:34:12 +0000 (15:34 -0800)]
Stub RemoteprofileAction to show the standard profile header stuff for offsite users -- provides a way to get at the mod & block controls for remote users.

14 years agosome User -> Profile cleanup to help in adapting the profile page action to show...
Brion Vibber [Mon, 15 Nov 2010 23:32:57 +0000 (15:32 -0800)]
some User -> Profile cleanup to help in adapting the profile page action to show stuff for remote users. Subscriptions, groups, roles, etc are all on profiles now so go ahead and use em.

14 years agoStub ModPlus plugin: will hold experimental UI improvements for mod actions
Brion Vibber [Mon, 15 Nov 2010 22:15:41 +0000 (14:15 -0800)]
Stub ModPlus plugin: will hold experimental UI improvements for mod actions

14 years agoMerge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Mon, 15 Nov 2010 21:56:17 +0000 (13:56 -0800)]
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

14 years agoclear_jabber.php script to clear confirmed jabber/xmpp addresses from one or more...
Brion Vibber [Mon, 15 Nov 2010 21:26:42 +0000 (13:26 -0800)]
clear_jabber.php script to clear confirmed jabber/xmpp addresses from one or more accounts

14 years agoAdd some data integrity checks on oembed tests (shows a bug on identi.ca test case...
Brion Vibber [Mon, 15 Nov 2010 20:58:00 +0000 (12:58 -0800)]
Add some data integrity checks on oembed tests (shows a bug on identi.ca test case -- missing width/height in photo data)

14 years agoInclude width/height of locally-uploaded images in our oembed provider data for attac...
Brion Vibber [Mon, 15 Nov 2010 20:57:15 +0000 (12:57 -0800)]
Include width/height of locally-uploaded images in our oembed provider data for attachment pages.

14 years agorestore empty showFallback() for attachment display; still needed for one-offs
Brion Vibber [Mon, 15 Nov 2010 20:56:56 +0000 (12:56 -0800)]
restore empty showFallback() for attachment display; still needed for one-offs

14 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Mon, 15 Nov 2010 20:38:53 +0000 (12:38 -0800)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

14 years agoDrop PEAR Services_oEmbed -- ended up replaced by our oEmbedHelper wrapper. The extra...
Brion Vibber [Mon, 15 Nov 2010 20:35:15 +0000 (12:35 -0800)]
Drop PEAR Services_oEmbed -- ended up replaced by our oEmbedHelper wrapper. The extra validation available there is problematic, and their code for building HTML for us wasn't being used anyway.

14 years agoTest oEmbed lookups with oohembed both on and off explicitly
Brion Vibber [Mon, 15 Nov 2010 20:32:29 +0000 (12:32 -0800)]
Test oEmbed lookups with oohembed both on and off explicitly

14 years agoRestructure oembed test sources
Brion Vibber [Mon, 15 Nov 2010 20:25:44 +0000 (12:25 -0800)]
Restructure oembed test sources

14 years agoAdd some basic oEmbed lookup test cases; fixed a bug in discovery fallback.
Brion Vibber [Mon, 15 Nov 2010 19:55:28 +0000 (11:55 -0800)]
Add some basic oEmbed lookup test cases; fixed a bug in discovery fallback.

14 years agoDrop some debug lines
Brion Vibber [Mon, 15 Nov 2010 19:30:35 +0000 (11:30 -0800)]
Drop some debug lines

14 years agoSwap the Services_oEmbed wrapper in oEmbedHelper out for doing it ourselves...
Brion Vibber [Mon, 15 Nov 2010 19:25:38 +0000 (11:25 -0800)]
Swap the Services_oEmbed wrapper in oEmbedHelper out for doing it ourselves...
- workaround for providers that are skimpy on their data, such as missing width/height or thumbnail_width/thumbnail_height
- workaround for YFrog listing "image" instead of "photo" type
- generally more lax about formatting: if it comes back and looks kinda ok, we'll take it.
- discovery uses system HTML parser, should be more robust if the links include things like ampersands with proper HTML-level escaping

14 years agoAtomPub-related actions are only read-only on GET
Evan Prodromou [Mon, 15 Nov 2010 19:14:09 +0000 (14:14 -0500)]
AtomPub-related actions are only read-only on GET

14 years agoWorkaround for yfrog.com photo attachments: fudge File_redirection::lookupWhere(...
Brion Vibber [Mon, 15 Nov 2010 19:01:00 +0000 (11:01 -0800)]
Workaround for yfrog.com photo attachments: fudge File_redirection::lookupWhere()'s HTTP handling -- when we get a 204 on a HEAD, double-check it by re-running as a GET. yfrog.com returns a 204 incorrectly for this case.

14 years agodoc comments on File::processNew
Brion Vibber [Mon, 15 Nov 2010 19:00:42 +0000 (11:00 -0800)]
doc comments on File::processNew

14 years agoMerge remote branch 'gitorious/0.9.x' into 0.9.x
Evan Prodromou [Mon, 15 Nov 2010 16:57:31 +0000 (11:57 -0500)]
Merge remote branch 'gitorious/0.9.x' into 0.9.x

14 years agoMerge branch 'atompub' into 0.9.x
Evan Prodromou [Mon, 15 Nov 2010 16:57:19 +0000 (11:57 -0500)]
Merge branch 'atompub' into 0.9.x

Conflicts:
actions/apistatusesshow.php
actions/apitimelineuser.php

14 years agoadd hooks for atom pub posts
Evan Prodromou [Mon, 15 Nov 2010 16:54:42 +0000 (11:54 -0500)]
add hooks for atom pub posts

14 years agoEncapsulate the oEmbed -> oohembed fallback into oEmbedHelper class. Also added a...
Brion Vibber [Sat, 13 Nov 2010 01:41:35 +0000 (17:41 -0800)]
Encapsulate the oEmbed -> oohembed fallback into oEmbedHelper class. Also added a chance to whitelist sites that don't show discovery info but do have oEmbed API endpoints, and to provide alternate APIs for some common services.

Newly supported:
- TwitPic: added a local function using TwitPic's API, since the oohembed implementation for TwitPic produced invalid output which Services_oEmbed rejects. (bug filed upstream)

Tweaked...
- Flickr: works, now using whitelist to use their endpoint directly instead of going through oohembed
- Youtube: worked around a bug in Services_oEmbed which broke the direct use of API discovery info, so we don't have to use oohembed.

Not currently working...
- YFrog: whitelisting their endpoint directly as the oohembed output is broken, but this doesn't appear to work currently as I think things are confused by YFrog's servers giving a '204 No Content' response on our HEAD checks on the original link.

14 years agoSave attached URLs when importing a Twitter status: this lets our thumbnail detection...
Brion Vibber [Sat, 13 Nov 2010 01:40:34 +0000 (17:40 -0800)]
Save attached URLs when importing a Twitter status: this lets our thumbnail detection handle photos and videos linked to by Twitter posters.

14 years agoOnly use saved thumbnails for notice list attachment thumbs -- don't attempt to searc...
Brion Vibber [Fri, 12 Nov 2010 22:03:57 +0000 (14:03 -0800)]
Only use saved thumbnails for notice list attachment thumbs -- don't attempt to search enclosures for photo types. We now save thumbs directly for oEmbed photos that don't list a separate thumb entry (like Flickr), so it's not needed. Keeps things cleaner :D

14 years agoSave oEmbed photo references as thumbnails if there's not a separate thumbnail_url...
Brion Vibber [Fri, 12 Nov 2010 22:03:08 +0000 (14:03 -0800)]
Save oEmbed photo references as thumbnails if there's not a separate thumbnail_url entry in the return data. This fixes thumb saving for Flickr photo references.

14 years agofix syntax error introduced in i18n tweaks: newgroup action
Brion Vibber [Tue, 2 Nov 2010 21:03:50 +0000 (14:03 -0700)]
fix syntax error introduced in i18n tweaks: newgroup action

14 years agoRevert "Missing one close-paren in newgroup.php" - incorrect fix for paren bug
Brion Vibber [Fri, 12 Nov 2010 21:34:04 +0000 (13:34 -0800)]
Revert "Missing one close-paren in newgroup.php" - incorrect fix for paren bug

This reverts commit 3afb031d9270a29db7f1ac4a964bb4b796759827.

14 years agoMerge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Fri, 12 Nov 2010 21:32:48 +0000 (13:32 -0800)]
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
actions/newgroup.php

14 years agoFix for failure edge case in TwitterBridge outgoing repeat/retweets.
Brion Vibber [Fri, 12 Nov 2010 21:06:41 +0000 (13:06 -0800)]
Fix for failure edge case in TwitterBridge outgoing repeat/retweets.

When the retweet failed with a 403 error (say due to it being a private tweet, which can't be retweeted) we would end up mishandling the return value from our internal error handling.
Instead of correctly discarding the message and closing out the queue item, we ended up trying to save a bogus twitter<->local ID mapping, which threw another exception and lead the queue system to re-run it.

- Fixed the logic check and return values for the retweet case in broadcast_twitter().
- Added doc comments explaining the return values on some functions in twitter.php
- Added check on Notice_to_status::saveNew() for empty input -- throw an exception before we try to actually insert into db. :)

14 years agoMerge branch 'oembed-thumbnails' into 0.9.x
Brion Vibber [Fri, 12 Nov 2010 20:28:44 +0000 (12:28 -0800)]
Merge branch 'oembed-thumbnails' into 0.9.x

14 years agoAdd a quick config setting to disable/enable display of thumbnails in regular notice...
Brion Vibber [Fri, 12 Nov 2010 20:24:55 +0000 (12:24 -0800)]
Add a quick config setting to disable/enable display of thumbnails in regular notice lists (attachments/show_thumbs) - disabling gives the same display as before this feature was added (but changes to oembed handling are still there, and the lightbox popup is gone)

14 years agodrop a comma which isn't actually an error but keeps throwing annoying warnings in...
Brion Vibber [Fri, 12 Nov 2010 20:10:51 +0000 (12:10 -0800)]
drop a comma which isn't actually an error but keeps throwing annoying warnings in netbeans

14 years agoDrop commented-out code from old lightbox & thumbnail popup stuff
Brion Vibber [Fri, 12 Nov 2010 20:10:29 +0000 (12:10 -0800)]
Drop commented-out code from old lightbox & thumbnail popup stuff

14 years agodon't try to initialize the mapstraction canvas if it doesn't exist
Evan Prodromou [Fri, 12 Nov 2010 16:46:45 +0000 (11:46 -0500)]
don't try to initialize the mapstraction canvas if it doesn't exist

14 years agodon't try to initialize the mapstraction canvas if it doesn't exist
Evan Prodromou [Fri, 12 Nov 2010 16:46:45 +0000 (11:46 -0500)]
don't try to initialize the mapstraction canvas if it doesn't exist

14 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Thu, 11 Nov 2010 20:32:24 +0000 (15:32 -0500)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

14 years agogive users a chance to opt out of email summaries
Evan Prodromou [Thu, 11 Nov 2010 19:51:14 +0000 (14:51 -0500)]
give users a chance to opt out of email summaries

14 years agofix update of email prefs in queue handler
Evan Prodromou [Thu, 11 Nov 2010 19:50:53 +0000 (14:50 -0500)]
fix update of email prefs in queue handler

14 years agoFix missing close of comment block
Zach Copley [Thu, 11 Nov 2010 18:33:26 +0000 (10:33 -0800)]
Fix missing close of comment block

14 years agoFix missing close of comment block
Zach Copley [Thu, 11 Nov 2010 18:33:26 +0000 (10:33 -0800)]
Fix missing close of comment block