* master:
Fixing mark as read when disabling double clicks.
Android v3.5.
New preferences: double-clicking site titles and unread counts.
Fixing the default PuSH lease by setting it to 10 minutes (matching the reference hub). Huge thanks to @mihaip.
Now forcing image sizing.
Switch remaining story loading to new async model.
Switch folder reading and All Stories reading to new async model.
Move saved stories fetch to new async model.
Generalise handling of story request responses.
Update some auto-gen cruft that recent tools fixed.
Switch social feeds to new async system.
Fix some async crashes.
Update to API level 19!
Update to API level 19!
Fix crash on async callback in reading fragment.
Initial decouple of feed story sync from sync service. Buggy.
Conflicts:
media/js/newsblur/views/feed_title_view.js
* 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
# By Samuel Clay (5) and Nicholas Riley (4)
* master:
RC2 for offline iOS.
Re-enabling Google News fetches.
Fixing premium interval in statistics.
Fixing iOS issue on river terminating prematurely.
Clarifying API.
Show Send To in a popover on iPad.
Don't leave popover orphaned when showing original on iPad.
Fix menu popover size on iPad.
Stop menu view controllers from scrolling.
* master: (26 commits)
Fixing unknown host error on DO servers.
Using All Site Stories instead of Top Level on folder chooser.
Adding new preference for auto-opening a default folder on load.
Unread counter overlay widget for feeds and social feeds.
Fixing memory leak when reloading feeds (after add/remove/move), found entirely through @mihaip's hard work. Thanks!
Disallowing single subscriber feeds to be loaded by non-subscribers.
Fixing #383. Need a way to retrieve starred stories by hash.
Previous story button takes you up, no longer to previous story. Should've done this a while ago.
Adding story intelligence score tip to API.
Adding user_profile to /reader/feeds. Has is_premium field, as well as web preferences.
Switching feed link to point ot the feed's permalink, not a feed filter on the blurblog.
Preventing popular from sharing stories from the same feed id in the same batch.
Upping delay on new user queue.
Fixing jenny holzer quote at end of blurblogs.
Adding better error logging/messaging for marking stories as starred.
Adding better error logging/messaging for marking stories as starred.
Fixing broken icon bug.
Fixing missing user_id in comment's replies and likes.
Posting popular shared stories to twitter.
Boosting shared stories on popular.
...
Conflicts:
apps/reader/views.py
