* master: (22 commits)
Turn original text caching back on.
Extracting images from original text's noscript.
Fetcing the original text now extracts the image url for others.
Monkey patching SSL for new python, since hostnames don't match with S3.
Converting videos in email notifications to images.
Upping quota to 100 shared stories a day.
Bumping premium shares to 50 per day.
Android v5.1.0
Only 20 stories may be shared per day for premiums, 3 for free users. Also hits IFTTT sharing.
Improving messaging on emails that have OPML backups. Thanks to @frenetic for bringing this up. Closes#1003
Fixing up postgresql backup.
Hiding cookie lost message.
Parallel pgbouncer kill.
Fixing attribution in twitter RTs.
Downgrading to elasticsearch 2.4.4, since pyes isn't ready for ES 5.
Adding support for native RTs in Twitter.
Automatically disbaling transparent huge pages (THP) on mongo and redis. Also upgrading to elasticsearch 5.2.2, although its untested.
Add two buttons to get the app
Fixing broken getsatisfaction community feedback.
Goodbye Turn Touch campaign.
...
* master: (771 commits)
Fixing horrible session loss bug. Turns out the django-redis-sessions library changed timeout behavior, from silently retrying to silently failing. Adding necessary SESSION_* vars.
Better handling of booleans on /reader/feeds.
Fixing redis bootstrap
Add Firefox to story browser list
Dashboard should not show old stories.
Faking user agent when rss bans NewsBlur.
Better recording of non-200/300 status codes on feed fetch.
Adding new debug to feed fetcher.
Embedding kickstarter module for TT on dashboard.
notifications alpha 2
Updating TT launch email.
Linking image on TT email.
No sudo on virtualenv.
Adding missing feeds for users as part of cleanup.
Fixing spacing issues in Turn Touch email.
Updating Turn Touch email.
Upgrading Readability and forcing images to remain. THis should add a bunch of images back to the Text view.
Andorid v5.0.
Fixing bug that would clear river cache while reading the river, caused by the dashboard river reloading when it wasn't visible.
Revert "Moving from Whitney to Whitney ScreenSmart."
...
* master:
Backporting grid layout so that if a user goes from dev, which has the new grid, back to www, which doesn't, they will still be able to use the site.
