* 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
* master:
Preventing brentozar.com from being subscribed to because their lawyer sent me a Cease and Desist nastygram.
Adding lisp syntax highlighting. Also upgrading syntax highlighter.
Per @IFTTT's request, changing ifttt key to meta.
Make full mark-read action lifecycle recount stories, not just first mark.
Improve chaining of updated cursor data from Reading activity down through to adapter and fragments.
* master:
Better color for logging in cleanup.
Fixing typo on cleanup tasks.
Adding cleanup for users to find missing feeds.
Fixing logging for user verification>
Adding safety net for lost feeds.
Don't attempt to retain and locally bookkeep offline stories for non-premium users. (#595)
Add mark-newer-read API. (#592)
* 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.
...
* master: (23 commits)
Premiums are never spammers.
Adding a bit more logic to defense.
No index for robots on blurblogs. This should stop the spam.
Adding user find by id for staff.
Adding destroy flag when killing spammers.
Fixing stories with no title and only html for content (no text, just an image). Using permalink as title since a title cna't be extracted from content.
Adding export user's opml functionality for staff.
Fixing case insensitivity for logging in with an email address.
Fixing pip requirements conflicts.
Force an intelligence change for re-rendering story title trainers.
Only active feeds count unreads.
Fixing unread counts to only include active sites.
Adding logging info to auto-spam delete.
Killing spammers when sharing popular stories.
Move refresh to menu. Use NewsBlur colours for refresh colour scheme.
Handling exception on twitter photo sync.
Adding a twitter sync for everybody.
Initial integration of SwipeRefreshLayout
Redirects in dev still point local.
Better redirect on missing icon.
...
* master: (59 commits)
Correctly limiting stories in rss feeds.
Correctly limiting stories in rss feeds.
Correctly limiting stories in rss feeds.
Handling errors with sharing stories.
Android 4.0.0b1.
Handling removed stories from mark as unread.
Bump version number to force DB reset.
Make read-story retention default off.
Tweak status LnF.
Adding extra narrow content setting to fix sideoptions width.
Swap in cached images if offline.
Don't imply unread status from unread hash list if not premium.
Clean up noisy image loader logging.
Don't drop pending feed loads during sync.
Fixing unread count sizing on folder headers.
Fix binding of multi-feed API responses.
Fix loading of saved stories to use normal stories table.
Option to enable image caching.
Image prefetching.
More efficient thread re-use in sync service.
...
* master: (31 commits)
Fixing login screen for Reeder.
Fixing login screen for Reeder.
Explicit viewport.
Explicit viewport.
Explicit viewport.
Explicit viewport.
Adding viewport to login/signup screen.
Set source_used_id correctly when sharing from a blurblog (#551)
Adding debug option to all text importers.
Adding user_id to every response.
Adding WAI-AREA support for <article> to support LiveJournal.
Fixing last few font size changes for new feed title font styler.
Boosting readability's ability to read Medium posts.
Adding feed font size. Configures both story titles and feed titles. This one's for you @theromit.
Probably not a bug. Probably Adblock.
Adding autosize to share textbox.
Hiding mark as read button when searching.
Fixing images in tutorial.
Removing unnecessary inset box shadow on header elements.
Further correcting OAuth spacing on mobile.
...
