* master: (123 commits)
Handling broken getsatisfaction feedback url.
Handling feeds that go missing.
Fixing yet another requests error on icon fetching.
Handling more errors when fetching feeds.
Raising time limit on analytics cleaning.
Handling another requests error when fetching icons.
Cleaner spam logging.
No IP is grounds for spam.
Fixing IP logging.
Deleting users should log IP.
Fixing #827 - double tapping was disabling scrolling but not turning it back on. This is in response to the fix#786.
Stubbing in new MFeedFolder model to count folders that feeds are in.
iOS: fixed#821 (improve sharing for Notes)
Android v4.6.0.
iOS app v5.0.1.
I think this is a better fix for the iOS 8 crash
Crash on iOS 8.4.
iOS: fixed#771 (mark all as read)
No longer stripping debug symbols from ios release. No need, considering NewsBlur is open source. And this helps debug end user issues.
Fixing part of #771 - pruning queued read stories that have already been marked as read (in case they are in purgatory and can't get marked read). Also fixing a crash when a folder claims to have unreads but doesn't (NSNull+JSON for handling empty results from the server.)
...
* master:
Correctly showing text or story view for stories based on story feed, not folder.
Experimental commit to speedup scrolling between stories.
Cleaning up a couple warnings.
Updating Fabric.
Fixing Safari view on ipad, although still need to remove navigation bar.
Adding updated Android screenshots for both phone and tablet sizes.
Android v4.5.0.
Fixing iOS share extensions.
Using canonical rss url.
* 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: (29 commits)
Adding new preference for wrapping story content either at 700px or edge of screen.
Bumping Android to v4.2.1.
Work around API change that throws out hidden stories and vends blank pages. (#664)
Fixing duplicate Pocket share extension message.
Don't cache super-small images.
Don't use cache filenames that are impossible to debug.
Fix image prefetch for protocol-hopping redirects.
Keep action replays around until there is less risk of them being needed.
Overhaul and simplify nextUnread search algo. (#640)
Ensure recounts don't get stuck behind story page requests.
Updating push logging message when skipping.
v4.2.0 of android app.
New maintenance message.
Updating fabfile to handle psycopg2/pgbouncer.
Tweak load throb anim speed for stock devices.
Tweak and comment new story list loading indicator.
Move story list loader to correct position. (#582)
New loading-progress animation for story lists. (#582)
Chopping off milliseconds in push delta.
Chopping off milliseconds in push delta.
...
