* master: (59 commits)
Handling twitter posting error.
Fixing bug where closed story would show inline detail when switching b/w Text and Feed view.
Temporarily locked = suspended on twitter.
Adjusting flashing loading indicator to be less conspicuous.
Handling validation of emails on api.
Handling lxml parser errors for original text.
Adding exception handling for twitter feeds.
Switch to filter instead of opacity
iOS: fixed#924 (losing story on lock)
iOS: white flash fix
iOS v6.0.3.
Handling deletion of feeds in folders where the parent folder has hypens (which are stripped on iOS/mobile to handle flat).
iOS: Fixed unread count issue when offline
Fixing twitter status permalink.
Handling YouTube playlists.
Android v4.9.0.
iOS: Eliminate duplicate URLs when sharing to Twitter, Facebook, Weibo and OmniFocus.
Clean up activity handling, and fix sending to Reading List.
Update Dockerfile
Upgrading tweepy, hoping it fixes auth issues w/ twitter.
...
* master:
Android v4.8.0b1.
Classifiers should respect new story authors escaping.
Clearing a story's Text view cache when the story is updated.
Newsletter authors no longer get escaped server-side. The web should know how to escape.
Rate limiting insta-fetching to 10 fetches per 10 minutes.
Feed selector now shows muted sites.
Trimming feeds down to 10 stories (from 25) when going two months unread.
Only auth users may search feeds.
Only search aggressively if authenticated.
Adding IP logging to feed searching.
Adding find_feed logging to diagnose postgres issues.
Disable debug logs.
Reconcile local and remote unreads much more quickly for hyperusers.
Don't bother UI-friendly duty cycling when the UI isn't up.
Remove unused member in Story object.
More efficient story cleanup for hyperusers.
Stripping quotes out of newsletter sender names.
Turns out empty string is false in JS.
Fixing misaligned grid stories when title matches content.
* master: (112 commits)
Feedfinder user agent is presenting problems. Changing to 'NewsBlur Feed Finder'
Scrubbing newsletters.
Ignoring more dirs in textmate.
Originals
Handling missing OAuth token for twitter.
Fixing PuSH issue with urls for hubs that look like: '//alert-hub.appspot.com'
Handling mis-shapen icons.
Handling IncompleteRead from requests during icon fetch.
Handling missing rss URLs when checking site from bookmarklet.
Better handling of PuSH errors.
Fixing add url when searching for rss feeds.
app image gets pull+pip.
Upgrade HTTP libs.
Remove debug status widget for overlapping story syncs.
Using latest app image.
Make reading session inits synchro with story cursor fetches. Re-enable stateful tracking of feed story progress between feed fetches.
Cleanup some timegate code for easier debug.
Can't use 'sender' as it's gets mucked up with forwarding rules. Switching to reconstructing email from 'from' field.
Better formatting of plaintext newsletters.
Handling plain text email newsletters.
...
* master: (138 commits)
Android v4.7.0b2.
Adding search query to query string on web.
Tweak story search menu item to properly toggle.
Allow story search icon to appear as icon in actionbar where able.
Fixing redirect behavior by saving redirect history for 25 fetches when one 400+ error is found.
Fixing tag stripping in content previews.
Why check if feed pane size is too small and force a resize?
Moving show hidden stories to story titles header. Folder keeps its own, feeds use story titles.
24 hour max for premiums, 48 hour max for free
Testing out faster feed updates for premiums.
Better handling youtube feed errors.
Fixing token errors on searches.
Handling issue where counting premiums is not being saved due to db issue.
.tm_properties
Fixing a longstanding bug in the exception changer dialog. Now correctly finding branch feed.
Factor out ugle custom serialisation in prep for Saved story tag reading.
Re-enable unread prefetching for non-premium accounts.
Update Dockerfile
Cleaning up story list view.
Fixing switching layouts b/w starred stories and read stories on web. Also fixing premium explainer on both when in Full view.
...
* master: (111 commits)
Icon importer needs to actually be different, not just forced.
Android v4.7.0b1.
Offering shared story back in api when sharing story.
Turning on feed trimming by read stories.
Refining read story check on trim.
Seeing how many stories would be eliminated using new read story checker.
Bump android version for Beta.
Add debug about stuck actions to the feedback info dump.
Add purge_tag and purge_author to Feed.
Adding purge stories to fix db corruption bug.
Fix problems with folders containing special characters.
Fetching title and content from stories shared without content+title. For #755.
Adding original text fetcher to /api/share-story requests that have no content.
Fixing tlnb logging viewer.
Upgrading api/share_story to newer required_params api.
Fix crash on pre 4.4 platforms when choosing folders.
Use standard mode in the story detail web view.
Fix tapping on target=_blank links not working in the original story view.
Fix Mail action in "Send to" from the original story view not including the URL.
For #755: adding authenticated /api/share_story/ endpoint that doens't use profile token.
...
* master: (25 commits)
Fixing #801. Now checking for try-feed earlier, as well as correcting for when it's not ready to be checked. Handles race condition on iPad.
V5.0.2.
Correcting the display of error messages on feed detail view. Also hiding the error globe on empty folders. Lastly, when loading empty feeds/folders, scroll to show search bar.
Fixing rotation issues on iphone and ipad when rotating in original view and returning back to story.
No longer clearing story when opening original view. Also fixing rotation issues when returning to story detail from rotated original view.
Handling more requests errors in text importer.
Fixing organizer: when adding a folder, losing selection bindings.
Bump Android app version.
No need for www in youtube urls.
Fix rendering of saved stories in story lists.
Fix crashes when launching stale or impossibly timed Reading activities.
Don't allow an untimely feedfolder sync to write stale unread data.
Reduce some UI lag from racing API requests.
skip encoding checking. requests.get already did it for us. requests.get always returns unicode in 'text'
PEP8 fixes: removed whitespaces from the blank lines
Fix infinite recursion for duplicate folders.
iOS: Fix crash marking story as unread if no story has been displayed yet.
iOS: Don’t scroll the story titles table when returning to the feed detail view (#832).
convert story_content to string before compression. zlib.compress fails with unicode text that contains non-ASCII symbols.
PEP8 fixes
...