Brion Vibber
9621904cac
Revert "Missing one close-paren in newgroup.php" - incorrect fix for paren bug
...
This reverts commit 3afb031d92
2010-11-12 13:34:04 -08:00
Brion Vibber
65eeb7cba5
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
actions/newgroup.php
2010-11-12 13:32:48 -08:00
Brion Vibber
6291e8201f
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. :)
2010-11-12 13:06:41 -08:00
Brion Vibber
5d12ec0532
Merge branch 'oembed-thumbnails' into 0.9.x
2010-11-12 12:28:44 -08:00
Brion Vibber
cb124fe831
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)
2010-11-12 12:24:55 -08:00
Brion Vibber
cda59dc177
drop a comma which isn't actually an error but keeps throwing annoying warnings in netbeans
2010-11-12 12:10:51 -08:00
Brion Vibber
62467f51e5
Drop commented-out code from old lightbox & thumbnail popup stuff
2010-11-12 12:10:29 -08:00
Evan Prodromou
b6af5a25ba
don't try to initialize the mapstraction canvas if it doesn't exist
2010-11-12 11:48:17 -05:00
Evan Prodromou
fdf3a23da7
don't try to initialize the mapstraction canvas if it doesn't exist
2010-11-12 11:46:45 -05:00
Evan Prodromou
c4a8a6776e
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-11-11 15:32:24 -05:00
Evan Prodromou
2d55bc0e5b
give users a chance to opt out of email summaries
2010-11-11 14:51:14 -05:00
Evan Prodromou
adb16b8098
fix update of email prefs in queue handler
2010-11-11 14:50:53 -05:00
Zach Copley
0ed572ff3f
Fix missing close of comment block
2010-11-11 10:39:05 -08:00
Zach Copley
09aaf21e8d
Fix missing close of comment block
2010-11-11 10:33:26 -08:00
Brion Vibber
fbd8052d05
Add error logging for a couple send-fail cases in XMPP out
2010-11-10 15:26:18 -08:00
Brion Vibber
46223da594
CSS class tweak for inline attachment thumbnails to avoid things thinking they're content links
2010-11-10 14:31:55 -08:00
Craig Andrews
cc0038d47c
Fix isHTTPS to work correctly for Cherokee and IIS
2010-11-10 15:53:20 -05:00
Zach Copley
3c921f38de
Add an action to handle deauthorization callbacks from Facebook
2010-11-10 01:18:06 +00:00
Brion Vibber
592e0bc505
add title attribute on attachment list items
2010-11-09 16:43:37 -08:00
Brion Vibber
5a3d01423d
Cleanup on the CSS for inline attachments; removed some unneeded changes since the split of the inline and regular attachment lists. Removing commented-out code that seems to be for some old thumbnailing system where the thumbnails were hidden popups within the core text (wtf!)
2010-11-09 16:28:33 -08:00
Zach Copley
5b94d9e86b
Merge branch '0.9.x' into facebook-upgrade
2010-11-09 23:16:17 +00:00
Zach Copley
17ae690d59
Make a richer StatusNet profile from a user's Facebook profile
2010-11-09 23:14:50 +00:00
Evan Prodromou
3afb031d92
Missing one close-paren in newgroup.php
2010-11-09 17:08:11 -05:00
Evan Prodromou
a4654bfe9f
session table was missing from upgrade scripts
2010-11-09 15:09:00 -05:00
Brion Vibber
dbb95b76a4
Allow YouTube-style media links to be counted as enclosures for purposes of listing attachments/thumbs
2010-11-09 12:04:07 -08:00
Evan Prodromou
41a0f18301
Merge branch '0.9.x' into emailsummary
2010-11-09 15:01:07 -05:00
Evan Prodromou
a988e2e97b
hook points for the email settings form
2010-11-09 15:00:30 -05:00
Brion Vibber
f25accc43e
split out InlineAttachmentList from AttachmentList
2010-11-09 10:45:19 -08:00
Evan Prodromou
e87323e426
change width of notices table to display better
2010-11-09 13:04:11 -05:00
Evan Prodromou
9ea1a9c631
session table was missing from upgrade scripts
2010-11-09 12:53:57 -05:00
Evan Prodromou
17ab5c31ed
some alignment in the table layout
2010-11-09 07:04:50 -05:00
Evan Prodromou
76aed36f38
set height and width of avatar td in email summary
2010-11-09 06:59:16 -05:00
Brion Vibber
504529e8cd
Keep aspect ratio when generating local thumbnails
2010-11-08 17:51:53 -08:00
Brion Vibber
694448e0aa
Add attachments 'thumb_width' and 'thumb_height' settings for inline thumbs, defaulting to 100x75.
...
This is used as the max thumb width/height for oEmbed requests (replacing the old default of 500x400 which was more suitable for the lightbox).
2010-11-08 17:36:02 -08:00
Brion Vibber
6d7f02ff31
Pass file attachment thumbnails along with oEmbed data.
2010-11-08 17:22:01 -08:00
Brion Vibber
c36fecb794
Save a thumbnail image when uploading an image file into the file attachments system. Currently hardcoded to 100x75, needs aspect-sensitivity etc.
2010-11-08 17:20:04 -08:00
Zach Copley
cd236efe12
- Still send notices to Facebook from existing Facebook app users
...
- Turns out we don't need the old REST lib to use the old REST API
(removed)
2010-11-09 00:56:53 +00:00
Brion Vibber
dc497ed090
Break out ImageFile->resizeTo() from ImageFile->resize(); allows resizing images to non-square sizes and to arbitrary destinations. Will be used for creating thumbnails as well as the originala use of cropping/sizing avatars.
2010-11-08 16:56:08 -08:00
Brion Vibber
a2994e3aa2
Testing... using photo info for temp thumbnails
2010-11-08 15:50:06 -08:00
Brion Vibber
551b196a35
doomy doom doom
2010-11-08 15:32:41 -08:00
Evan Prodromou
974e41aa4b
change to a table for HTML output
2010-11-08 18:14:13 -05:00
Evan Prodromou
37407d8c77
stylesheet for outgoing email
2010-11-08 17:31:21 -05:00
Evan Prodromou
0a56523461
Fixup headers for HTML email
2010-11-08 17:22:16 -05:00
Brion Vibber
32321de5e0
Some initial testing w/ thumb gen
2010-11-08 14:20:23 -08:00
Brion Vibber
883f7a6c0b
Avoid marking files as attachments that are not locally uploaded, unless they're really oembedable. HTML-y things now excluded properly.
2010-11-08 13:27:54 -08:00
Evan Prodromou
797059340e
Complete email summary sending system
...
Added the necessary classes to send email summaries. First, added a
script to run on a daily basis. Second, added a queue handler for
sending email summaries for users, and another to queue summaries for
all users on the site. Fixed up the email_summary_status table to
store the last-sent notice id, rather than a datetime (since we don't
support 'since' parameters anymore). Finally, made the plugin class
load the right modules when needed.
2010-11-08 13:10:09 -05:00
Evan Prodromou
9003769609
Merge branch '0.9.x' into emailsummary
2010-11-08 13:09:25 -05:00
Evan Prodromou
719b480eaa
use subclassing to change notice list output for single notice
2010-11-08 13:08:59 -05:00
Evan Prodromou
35931e3a0e
first steps for email summary
2010-11-08 10:36:19 -05:00
Evan Prodromou
892a32fed7
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-11-08 10:30:54 -05:00
