* master: (238 commits)
Upping ios to v4.6.4.
Including hidden stories in fetch. Also fixing send to button in story settings cog.
Less ifs when handling volume key
Add preference for volume key navigation
Override volume key for next/prev navigation in reading activity
Adding an include_hidden parameter to single feeds and rivers, defaulting to false. Clients that don't use hidden stories but use paging as an indicator will need to account for a hidden_stories_count field, as indicating in the API docs.
Bumping Android version to 4.2.0b1.
Disable debug.
Updating oauth toolkit to fix admin issues.
Better algorithm for image cache cleanup. (#627)
Unescape HTML entities in image alt text. (#652)
Redraw overlay buttons slightly less often when scrolling.
Resource-ify sync status messages.
Fix story sync status indication. (#644)
Adding autocomplete ignores.
Remove last traces of the legacy DB!
Migrate comment replies off of legacy DB.
Migrate user profiles off of legacy DB.
Start migrating comments from legacy DB.
Fix crash when updating old comments.
...
* master:
v4.6.1 of the iOS app. Submitted to the app store + enterprise deployment.
Fixing HTML in sent messages.
Stubbing in marking read above scroll.
Marking story as read if mouse lock position is below the top story.
* master:
Fixing scroll for search when loading feed detail.
Fixing multi-word search queries on ios.
Adding search bar to ios.
Adding messaging for premium-only in saved story tags.
Colorizing payment logging.
Colorizing payment logging.
Second typo. Stupid payment code can't be tested offline.
Typo.
Forcing re-sync of payment history on expiration.
Cleaning up payment history logging.
Fixing chooser dialog by forcing it to conform to modernized modal.
Conflicts:
media/js/newsblur/reader/reader_feedchooser.js
* 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: (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.
...
