* master:
Refactoring real-time socketio clientside to fix multiple client updates.
Unread counts only for logged in users.
Conflicts:
media/js/newsblur/reader/reader.js
# By Samuel Clay (12) and Lance Johnson (1)
* master:
Updating postgres config, celery queue.
Boosting feed fetching.
Android: show server error message to user when add feed fails. The error message was being sent when non-premium users tried to search for feeds and was causing the App to crash.
Removing unused feed hash index (keeping the unique constraint).
Adding two indexes and killing one unused one from feeds.
Returning index on active subs.
Changing logging on feed queueing.
Turning off autocomplete for the time being.
Removing unused indexes.
Upgrade to postgres 9.2.
Culling some graphs on feed counts.
Cleaning up week old feeds.
Boosting feed fetching way up for the weekend.
* master:
Adding task servers to db firewall.
Adding redis cache. Returning favicon server.
Better munin plugins for redis and mongo.
Removing unused redis keys for shared/comments. Dry-run.
Adding read preference to migration.
Migration to create story_hash for missing feeds.
Making a clearer description of slow feeds.
Upping feed fetches, slowing down fetch interval for less active feeds, setting premium expire time to one year from most recent payment date (as opposed to borked payment gap logic), and adding logginf or tasking feeds.
Switching check for HAProxy'ied socket.io to dev instead of www. Thanks @anaconda!
Sync delay in mongodb and updating story hash migration.
Upping feed fetches.
Fix force close when attempting to fetch a user with a null user.id value
Fix force close updating ProfileActivityFragment if no profile response was received
Move creating ImageLoader in NewsBlurApplication to onCreate to ensure that base context has been set and prevent force close
Boosting fetches.
Fix duplicate requirement
Conflicts:
fabfile.py
* master:
Adding dev and debug to firewall
Adding hyphens to allowed hosts for blurblogs.
Adding X-nginx-server and X-gunicorn-server.
Adding RStats, necessary to remove mongodb analytics.
Fixing firewall setup.
Using secondary mongos for feed fetch histories.
Moving to a single hosts and hosts.yml file, used to control logs, deployment, firewalls, and communication. Awesome!
Moving hosts to secrets.
Cache busting feeds on force and 1% of the time.
Conflicts:
config/nginx.newsblur.conf
* master: (589 commits)
Adding delete user flow. About time, since I'm sick of doing this myself.
Deractivating premiums.
Adding a lock for the intelligence slider for focus stories. If the user selects focus and there are actually focus stories, lock it for the future when there are no unread focus stories.
Uppiung the find next unread story titles page limit from 12 to 50.
Hiding folders with no unread stories in Unread/Focus mode.
Adding autocomplete to emailing a story dialog.
Using queue for scheduling feed fetches on load.
Renaming celerybeat supervisor task.
Fixing insta-fetching.
Attempting to correctly save duplicate feeds.
Adding tons of logging (especially user-facing) to feed exception handling. Much much better feed address and link fetch history.
New enterprise ios build includes full training.
Changing intelligence training on social feeds to apply to original feed as well.
Using a popover for training on the iPad. Also adding the train button to the bottom of every story.
Finishing training on iPad. Works in river too. Just need to test social and it's shipping.
Fixing title selectin bug when the title was too short to register the selection loupe.
Training feeds and stories in feeds. Needs testing on ipad, in river, and on social.
Finish look and feel of ios training for both story and feed. Just need to send requests, redraw intelligence, recount and reclassify stories, and update scores. All already written to support inline training.
A few more log color tweaks.
Adding clean stories task. Updating log colors.
...
Conflicts:
.gitignore
apps/reader/views.py
apps/social/views.py
templates/social/social_page.xhtml
templates/social/social_story.xhtml
templates/social/story_comments.xhtml
* master:
Fixing bogus type error, caused by duplicate feeds.
Correcting styling on site settings loader icon.
Removing dupe migration from feed_settings.
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Fixing #41: Adding REDIS to local_settings.py.template.
Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Switching to requests from urllib2/httplib. Bring on the page errors.
Adding a bunch fo keyboard shortcuts.
Adding elapsed time field to river and feed view.
Fixing autolinking of text links to no longer indiscriminately replace text, causing double encoding of html entities.
Fixing the space bar key to not queue, so it's actually useful now!
Refining media enclosures by adding all types and linking to their source.
Refining media enclosure detection.
Conflicts:
config/nginx.newsblur.conf
* master: (48 commits)
Updating copy on homepage.
Marking all as read on Everything view should clear folder unread counts.
Fixing error on committing to cache for rate limits when the dummy cache backend is used.
Adding linux.com story to press page.
Uniqifying stories when read.
Moving from sha module to hashlib.
Syncing time to account for time drift on VPS.
Fixing issue around showing too many Oh Nos on abort.
Save hash for address+link migration. necessary for a unique index.
Deprecating db02, moving redis and rabbitmq over to db01.
Updating nginx conf to support better amintenance pages giving a 503 status code.
Moving NewsBlur counts to beginning of title.
Fixing that crummy missing existing story issue.
Updating feedparser.
Fixing broken hashlib issue with feeds and no link.
Adding MongoDB slave to local_settings template.
Adding two new columns, necessary for the feed_settings branch: hash of address+link, and locking address.
Marking read stories in Feed view as very much read. Gradientizing, too.
Fixing /m/ for no good reason.
File under "fucking finally": Adding client-side error handling and callbacks for feeds and river.
...
Conflicts:
config/nginx.newsblur.conf
