* 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
