* 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: (30 commits)
Fixing search positioning on saved stories.
Fixing positioning of popover options in All Site Stories.
Adding Split tooltip.
Removing extra logging.
Switching feedbar and navbar.
Fixing mark folder as read.
Removing double.
Fixing mark as read on socialsubs.
Adjusting positioning on new feedbar. Also scrolling to selected feed/folder when switch story layouts.
Reloading feed list when adding, moving, and deleting feeds and folders.
Reloading feeds on feed/folder add and feedchooser.
Backend for marking feeds/folders as read at a specific timestamp.
Adding expanded mark read buttons. Needs backend support.
iOS v3. Fixed move site view folder placement as well.
Moving feedbar down to bottom of screen. Prep for new mark read buttons.
Fixing 2 ios crashes: double-tapping instapaper button and a weird keyboard condition.
Fixing activities height for subscriptions on ios. Also turning river back on for third-party clients. That wasn't fair and it's hard to get users to upgrade. I'd rather give users the ability to use the product instead of crippling it, unless there is a proper workflow for upgrading, which only exists on the web today.
Removing last traces of Google Reader from ios app. Also add better final page of ftux. Fixing folder chooser in add dialog on ios.
Fixing colors on share/train buttons when active. Fixing height on profile cells.
Stopping animation of share view/keyboard before orientation has changed.
...
Conflicts:
media/js/newsblur/views/story_titles_header_view.js
* master:
Trying to fix the unread counts ghosting issue by forcing an instant unread count refetch of active/selected feeds. This may work!
Fixing limits.conf to just use integers.
Making it a bit easier to setup a new db.
Updating Android app to v1.1 (revision 31).
