* master:
Moving to proper unicode string for feed fetching.
Colorizing feed fetching.
Colorizing feed fetching.
Adding two error classes to requests exception handling.
Adding two error classes to requests exception handling.
Adding two error classes to requests exception handling.
jQuery 1.6.1 -> 1.7.1. Fixes massive Chrome issues.
Adding shift+u as a shortcut for marking a story unread.
Adding more advanced exception handling for new requests module, with fallback to urllib2.
Adding urllib fallback to requests in page fetching.
Adding a little bit more leeway in page importer by falling back to urllib2 when requests fail.
Adding slight bit of color to feed fetcher.
Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
Conflicts:
media/js/jquery-1.6.1.js
media/js/jquery-1.7.1.js
node/node_modules/socket.io-client/support/test-runner/public/javascript/jquery.js
* 'master' of github.com:samuelclay/NewsBlur:
jQuery 1.6.1 -> 1.7.1. Fixes massive Chrome issues.
Adding shift+u as a shortcut for marking a story unread.
Boosting fillout pages.
Small cleanup in ajax manager.
* master: (30 commits)
Boosting fillout pages.
Small cleanup in ajax manager.
Abort old requests and don't cache responses. Trying to fix IE read story bug.
Force jquery to never cache.
Checking for exceptions earlier in order to show fixed site.
Changing user agent to hopefully override overly-sniffy websites.
Fixing inaccurate substitution on feed urls. Ugh, can't believe this was here this long.
Adding the setting of a feed's view settings to Site Settings dialog. This should've been in there a loooong time ago.
Fixing feed loads only once for those with skipping stories.
Adding handler to to_json calls on all serialized models.
Fixing two major bugs: auto filling stories now works far better nad doesn't lock you in. Also fixing the infernal unicode json parsing bug that's been effecting a bunch of sites.
Adding WP7 as user agent.
Adding necessary import when not running from the REPL.
Too many stories? Don't animate transitions when switching intelligence levels.
Fixing typo in iphone app that preventing mark folder as read when the visible stories option was showing.
Updating the mongo db copy util to also look for updated stories.
Globals.is_staff on user, not profile. Make the stats referesh every minute instead of every 10 minutes for staff.
Fixing offsets in river of news.
Adding ciphering to usernames in log, so I can finally take screenshots of the most colorful logs of all time.
Adding my very special mongo serialization backup utility to get around the damn unrepairable mongo database. This is taking 14 hours to run.
...
Conflicts:
templates/base.html
* master: (66 commits)
Too many stories? Don't animate transitions when switching intelligence levels.
Fixing typo in iphone app that preventing mark folder as read when the visible stories option was showing.
Updating the mongo db copy util to also look for updated stories.
Globals.is_staff on user, not profile. Make the stats referesh every minute instead of every 10 minutes for staff.
Fixing offsets in river of news.
Adding ciphering to usernames in log, so I can finally take screenshots of the most colorful logs of all time.
Adding my very special mongo serialization backup utility to get around the damn unrepairable mongo database. This is taking 14 hours to run.
Auto-refreshing feedback (1 min for staff, 10 min for everybody).
Fixing exception around multiple feeds during Google Reader import process. Also switching rate limit to status code 429.
Adding Nokia MeeGo client to user agents.
Only show raw feeds in feed autocomplete.
Handling iphone version for new users on ios app.
FIXING THE WORST BUG OF MY LIFE -- finally figured out what was causing the story-shows-as-unread bug. Also fixed enclosures on certain types of feeds.
Fixing menu manage open position to compensate for additional menu items.
Reducing the amount of work done by feed fetching when there are no new stories.
Fixing emergency bug around trimming feeds where the cursor is changing. Dammit mongo.
Simplifying ufw ports in fabfile. Adding env.user.
Launching the iPhone app on the front-page. Big deal.
Minor cleanup of river stories view.
Cleaning up mongoengine imports and settings for default MongoDB.
...
Conflicts:
local_settings.py.template
* master: (45 commits)
Launching the iPhone app on the front-page. Big deal.
Minor cleanup of river stories view.
Cleaning up mongoengine imports and settings for default MongoDB.
Killing off the old slave_db pattern.
Moving from slave_db to ReplicaSetConnection in pymongo 2.1.
Adding title and subtitle. (Big thanks to @ericflo for the inspiration.)
Adding title and subtitle. (Big thanks to @ericflo for the inspiration.)
Fitting the iphone web page on smaller screens.
The @jashkenas treatment -- cleaning up the iphone app page.
Adding rotation to iphone website.
Using the correct story permalink (if it is not correctly in the link key of the feed).
Finishign up interaction of iphone app trailer page. Need auto switching.
iPhone screenshots, iPhone page, complete with animations.
Adding current version to iPhone app so it can update from the server.
Removing unnecessary return to selected story on paging of story titles.
Scrolling the story titles view to the feedbar when a page is loading. Experimental, but may help a bunch of users know what's happening.
Stubbing in iphone page.
Solving the Read button dilemma for Everything vs. folders vs. feeds.
Disabling feed settings button on Everything river view.
Building folder delete into iOS app.
...
* 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
* master:
Adding 'E' as a keyboard shortcut for the Everything view.
Doubling the amount Space pages in a story.
Auto-linkify urls in stories.
Reading stories from slave db during feed update.
Conflicts:
settings.py
