* 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
# By Samuel Clay (3) and ojiikun (2)
* master:
Dirtying user subs and social subs on new mark read with story hash endpoint.
Adding mark_story_hash_as_read. Still needs subscription dirtying.
Updating fabfile to use new repo'd ssh keys.
Better detection of social stories when marking read.
Fix crash on speedy callbacks in feed item list view.
# By ojiikun (4) and others
# Via Samuel Clay (4) and ojiikun (3)
* master:
Fixing iOS crash on empty unread stories by providing correct data structure. Thanks to @linnet for spotting the bug.
Trimming river URL by allowing 'f' to be used as a feed id parameter.
Changed the read later success confirmation to use the checkmark HUD instead of an alert view.
Change save-story to use story hash.
Switch mark-unread task to use story hash.
More error handling improvements. Added developer debug mode.
More rework of feed item list to deal with missing feeds.
