* master: (42 commits)
Switching to new redis sessions db.
If text fails to fetch, tapping the text button should not change the text lock.
Fixing Feed view space bar scrolling bug where story is collapsed.
Adding new space bar behavior to full view as well.
Fixing space bar scrolling in list view.
Adding 'm' keyboard shortcut to toggle read/unread.
Shift+space goes backwards too.
Jumping to next story when scrolling using space bar.
Handling timeout on original page fetch.
Fixing timeout error on PUSH. Also fixing requests error on page importing.
Boosting timeout on analtics cleaning.
Adding fetch original page to msharedstory.
Fixing switching to and from text mode while still in current feed. Now to change river so that it uses text view setting from feed, not folder (unlike web).
Cutting unneccessary logging.
Adding user agents to logging. Reeder, Fever, Superfeedr, Old Reader, IE11.
Adding modern android app user agent in logging.
Switching back to original redis server for sessions while the new sessions server gets monitored.
Adding redis sessions db.
Making text view sticky on ios. Maybe bugs?
Upgrading to redis 2.8.
...
Conflicts:
media/js/newsblur/reader/reader_preferences.js
* master: (41 commits)
Fixing A&L Daily bug where stories all have the same GUID and permalink. Using permalink or timestamp, whichever is unique across the feed.
Bumping Android version.
Only hard-recount unreads if there is a mismatch between remote and local.
Ensure correct ordering of mark-actions and count refreshes.
Better overscroll event filtering.
Document new flag.
Don't check for online status too often.
Quicker transition from offline to online mode.
Offline indicator.
Status messaging for count updates.
Ensure refreshed feed counts show immediately.
Throw out reading actions that will never succeed.
Add story fetch setting to feedback debug.
Add network read profiling.
Complete unread recounting after reading sessions.
Monitoring disk usage should fail on error.
Fixing pythonpath for disk monitor.
Adding disk usage monitor to all database servers.
Deleting unstarred story as part of starred story cleanup.
Logging starred story params.
...
* master: (80 commits)
Handling error when user's twitter connection doesn't work.
Handling missing social subs caused by cached subs on android.
Updating elasticsearch to 0.90.13.
Checking premium status on paypal sync.
Bumping Android to 4.1.0b1.
Syncing offline status text with ios.
Buffer more stories while reading.
Fix login crash.
Fix logout crash.
Cap the duty cycle of expensive background services to prevent resource hogging.
Remove status message flicker.
Remove logging.
Ensure stories always load more buffer on start of reading activity. Ensure story load cancels quickly on return to feed list.
Tone down some logging.
Fix crash if user touches reading overlay before cursor is ready.
Fix reading progress indicator if new unreads are found during reading session.
Fix lock crash in legacy DB.
Ensure reading progress meter works on async load.
Discard stale stories if a reading action happens during fetch.
Fix crash.
...
* master:
Adding to regular /reader/feeds (non-flat) as per @manderson23's request. See 23bc4f2.
Adding ratelimit to friends list.
Showing is_staff on mobile devices. Useful for #631.
Logging signals for paypal.
Seeing if signals can be moved around.
Splitting paypal webhook events. Adding payment logging.
Fixing missing paypal IPNs.
Bumping android to v4.0.2.
v4.6.0 enterprise.
Submitting v4.6.0
Fixing ipad rotation page movement. Also correcting story position scrolling.
* master: (115 commits)
Adding webhooks url for paypal.
Better payment reports.
Adding changelog to enterprise deployment. Fixing share dialog on ipad.
iOS app v4.6b1.
Android app v4 beta 7.
Coloring cursor when adding tag.
Adding story tags to add tag popover.
Adding a tag. Ship it!
Fixing issue with off-by-1 numbers when changing tags. Also hiding tags with no stories.
Custom headers for saved story tags.
Better zgrep.
Fixing issues with saving starred story tags on ios. Nearly ready.
Don't recalculate virtual intel column; use it.
Remove unnecessary loader resets in story list.
Don't show inappropriate context menu items for saved stories.
Lower sync priority and fewer unnecessary syncs.
Start story list loader as soon as possible.
Generalise out all story list view creation logic.
Move saved item list to in-time adapter creation.
Move folder item list to in-time adapter creation.
...
Conflicts:
clients/android/NewsBlur/AndroidManifest.xml
clients/android/NewsBlur/src/com/newsblur/activity/ItemsList.java
clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
clients/android/NewsBlur/src/com/newsblur/database/DatabaseConstants.java
clients/android/NewsBlur/src/com/newsblur/database/FolderListAdapter.java
clients/android/NewsBlur/src/com/newsblur/fragment/AllSharedStoriesItemListFragment.java
clients/android/NewsBlur/src/com/newsblur/fragment/AllStoriesItemListFragment.java
clients/android/NewsBlur/src/com/newsblur/fragment/FeedItemListFragment.java
clients/android/NewsBlur/src/com/newsblur/fragment/FolderListFragment.java
clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
clients/android/NewsBlur/src/com/newsblur/fragment/SocialFeedItemListFragment.java
clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
clients/ios/Classes/NewsBlurAppDelegate.h
clients/ios/Classes/StoriesCollection.m
clients/ios/Classes/StoryDetailViewController.m
clients/ios/NewsBlur.xcodeproj/project.pbxproj
clients/ios/static/storyDetailView.css
