* 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: (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:
Adding API explainer for ps/nt/ng counts.
Adding .tm_properties to ignore.
Adding private spam catcher.
Twitter photo resync happens on every trim.
Don't mangle stories with code when updating, just use new story. Thanks Bruno!
Fixing landscape iphone 5s image width.
https domain for profile photos.
* 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.
