* 'master' of github.com:samuelclay/NewsBlur:
Don't know how I feel about this change, but http://gizmodo.com/author/mat-honan.xml is failing when 'Safari/X' is in the user agent, but only with http opener. Ugh.
Being much more aggressive about certain sites trying to take over the iframe. Blocking nytimes.com, twitter.com, and stackoverflow.com from even allowing an Original view.
Fixing keyboard dialog.
New preference: delay to mark a story as read.
Closing #52: Adding delicious to sharing services and preferences. Thanks @palewire for the suggestion.
db02 -> db01.
db01 -> db02
Adding backup restore for psql.
Adding NEWSBLUR.reader.count_unreads_across_all_sites()
Copying server settings.
* master:
Don't know how I feel about this change, but http://gizmodo.com/author/mat-honan.xml is failing when 'Safari/X' is in the user agent, but only with http opener. Ugh.
Conflicts:
utils/feed_fetcher.py
* master:
Being much more aggressive about certain sites trying to take over the iframe. Blocking nytimes.com, twitter.com, and stackoverflow.com from even allowing an Original view.
Conflicts:
media/css/reader.css
* master:
New preference: delay to mark a story as read.
Closing #52: Adding delicious to sharing services and preferences. Thanks @palewire for the suggestion.
Conflicts:
media/css/reader.css
media/js/newsblur/reader/reader.js
media/js/newsblur/reader/reader_keyboard.js
* 'master' of github.com:samuelclay/NewsBlur:
Truncating feed title in trainer dialog.
Adding French review to press page.
Conflicts:
media/js/newsblur/reader/reader_classifier.js
* 'master' of github.com:samuelclay/NewsBlur:
Adding send raw email link to Email Dialog. Thanks to @tylast for the idea.
Adding French review to press page.
Fixing icon fetching error when the page is corrupted.
Writing a glorious hack that forces a count of unread scores.
Trying to fix inaccurate unread counts by forcing the dirty flag and not allowing timeouts.
Removing unused cache.
Upping refresh interval a bit since every 6 seconds is a bit too much when importing new feeds.
Starred story titles, even if it kills us.
Chucking ntpd in favor of bluntly recalibrating time on VPSs.