* 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.
...
* 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.
...
