* 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 ojiikun (6) and Samuel Clay (3)
* master:
Adding ellipses in webkit.
Adding downtime handling to readme.
Putting a max on sporadic checks on broken feeds to 8x normal amount.
Complete styling of overlay buttons.
Placeholder styling of overlay buttons.
Enable/disabe state for overlay buttons.
Make overlay buttons fuctional.
Basic overlay button UI.
Fix crash on marking all stories read (#382)
* master:
Only turn real-time feeds into lazy feeds if there is a track record of push notifications.
Switching Email Story menu item to show email icon.
Turning off redis dupe story id writer.
* master:
Correct haproxy config to account for new http layer 7 health checks from nginx.
Cleaning up haproxy debug, logrotate.
Stripping tags in blurblog settings.
* master:
Handing out free accounts a little quicker.
Adding count of trimmed stories.
Adding redis backup for new redis stroy server.
Adding Buffer as a share option.
Moving story hash db to its own server (primary).
Adding cost to fabfile's list_do.
Moving node server to db pubsub role.
Moving from specific db hosts to db roles, editable through /etc/hosts.
New ssh keys, syn_cookies setting for redis pubsub server.
Handling socket level errors in socketio/node.
Catching exceptions for node redis.
Catching exceptions for node redis.
Trying to fix issues on node redis connection.
Handling redis connection timeouts in node.
* master:
Adding folder search for admin only. If you're reading this commit message, don't get excited. I probably won't be launching folder search using this method. It'll be a while before I can ship it. But if for some strange reason folder search is much faster than I thought, this has a chance.
Fixing rounded corners on Android. Also fixing a few spacing issues.
