* master: (771 commits)
Fixing horrible session loss bug. Turns out the django-redis-sessions library changed timeout behavior, from silently retrying to silently failing. Adding necessary SESSION_* vars.
Better handling of booleans on /reader/feeds.
Fixing redis bootstrap
Add Firefox to story browser list
Dashboard should not show old stories.
Faking user agent when rss bans NewsBlur.
Better recording of non-200/300 status codes on feed fetch.
Adding new debug to feed fetcher.
Embedding kickstarter module for TT on dashboard.
notifications alpha 2
Updating TT launch email.
Linking image on TT email.
No sudo on virtualenv.
Adding missing feeds for users as part of cleanup.
Fixing spacing issues in Turn Touch email.
Updating Turn Touch email.
Upgrading Readability and forcing images to remain. THis should add a bunch of images back to the Text view.
Andorid v5.0.
Fixing bug that would clear river cache while reading the river, caused by the dashboard river reloading when it wasn't visible.
Revert "Moving from Whitney to Whitney ScreenSmart."
...
* master:
Backporting grid layout so that if a user goes from dev, which has the new grid, back to www, which doesn't, they will still be able to use the site.
* master: (65 commits)
Oh my god what a terrible typo. Broke new users.
Adding mark as read button to All Site Stories on web.
Disconnecting facebook when session expires.
Showing facebook posting error.
Change text from mark previous to mark older as read in story context menu (#592)
Fix pager margin drawable for dark theme (#590)
Fixing URL munging when the url includes a non key=value pair in the query string. Ex: https://cns.utoronto.ca/~cks/space/blog/?atom. Thanks to @firesock for finding this.
Adding screenshots for iphone 6 and 6+.
Allowing guids to change if the permalink doesn't.
Don't re-fetch already cached images.
Synchronise DB upgrades with other DB actions. (#591)
Explicity synchro DB writes. (#591)
Cleaner service shutdown. (#591)
Show story list loading indicator only if stories are being fetched, not just if they are queued. (read: don't spin if offline) (#590)
iOS v4.5.0 submitted to the App Store.
Fix loading of stories in focus view.
Disable debug.
Disable debug.
Missed file from new loading indicator in reading frag.
Sync service triggers fewer redraws for loading indicators.
...
* master: (102 commits)
Adding starred_timestap to feed, folder/river, starred, and read feeds. Used for issue #585.
Upgrading all servers to ubuntu 14.10 LTS. Fixing bashocalypse.
Better paypal cancellation and refunds. Now showing paypal errors.
NewsBlur iOS v4.5 beta 3. With iPhone 6/6+ support.
Fixing full bleed images on phone 6 and 6+.
Fixing login view controller for iphone 6. Adding launch images for iphone 6.
Use a shorter localized date format which shouldn't overlap the refresh arrow in most cases.
Adding a missing logo for enterprise deployment.
Trying to fix provisioning issues with the version number.
Handling crash on marking read.
Another provisioning profile attempt.
Yet another provisioning profile for ios 8.
Fixing provisioning profile.
Pushing out ios v4.5.0b1.
Adding locale aware times to pull to refresh menu.
Fixing edge case of feeds still showing after being marked read.
Adding fade feed when read to preferences.
Remove finished TODO.
Don't infinite search for unreads if there are none.
Restore toast for feedback on story-unread from Reading activity.
...