# By Samuel Clay (39) and ojiikun (6)
# Via ojiikun (5) and Samuel Clay (4)
* master: (45 commits)
Fixing unread counts bug on ios.
Allowing up/down arrow keys to take you out of search box and into results.
Refactoring the snot out of the keyboard shortcuts dialog, sorting them into tabs/groups. Moving keyboard shortcut 'f' to 'shift+t' (train feed), killing old 'shift+t' to hide story titles (now unnecessary thanks to the Full view), and adding '/' to search feed.
Adding search logging.
Adding premium-only search message, enforced API-side. Also fixing display bug around hiding the search bar when clearing out query.
Better top border color.
Typo on border color.
Refactored the premium-only message for river in anticipation of premium-only search message.
Fix training dialogue.
Adding search to shared stories, removing from folders.
Fix reading view bottom buttons overflowing on small screens.
Fixing disappearing search box.
Showing search box.
Adding search box to all feeds/folders for staff only.
Fixing JS exception on missing users.
Testing out perf of mongo search on starred stories.
Fixing crash on ios for reading feed-less stories.
Fixing intro dialog from popping up on failing setup_feeds pref.
Fixing text sizes on Android.
Fixing colors on favicon-less feeds in android.
...
# By Samuel Clay (54) and others
# Via Samuel Clay (16) and ojiikun (3)
* master: (64 commits)
Fixing new uiactivities for ipad.
v2.4.1 of iOS app, ready for enterprise distribution.
Preference to hide public comments on iOS. Ready to ship for beta testing!
Removing debugging.
Fixing send to button on Original view. Now the two are finally linked together.
Fixing three bugs: proper caching of feed list in offline mode, fixing crash on loading feed when previously read stories, and stories showing up read in folders with an unread filter.
Adding new send to button to traversal bar. Now isntapaper is 2 clicks.
Fixing Pinboard images for use in preferences.
Adding Pinboard and Chrome.
Fixing Pocket.
Using native UIActivity. Readability and Pocket don't work yet.
Fixing unread stories being overwritten in the inbetween time from offline to online when loading stories.
Refactor sync service task types to use enums.
Refactor result codes for SyncService into enums. Remove deleteFeed from SyncService in preference to standard API call.
Switch all mark-read ops to new API using story_hash.
Fixing timestamp issue on image order.
Lots of offline progress: cancelling sync in the middle of one correctly, fixing bug around missing story hashes in sync, updating progress bar more often, fixing image caching bug that preventing caching from running at all.
Fixing Dilbert-specific encoding error.
Adding logging to profile views.
Fixing encoding on Original pages. Thanks @bruceyou for the wonderful help!
...
# By ojiikun (4) and others
# Via Samuel Clay (4) and ojiikun (3)
* master:
Fixing iOS crash on empty unread stories by providing correct data structure. Thanks to @linnet for spotting the bug.
Trimming river URL by allowing 'f' to be used as a feed id parameter.
Changed the read later success confirmation to use the checkmark HUD instead of an alert view.
Change save-story to use story hash.
Switch mark-unread task to use story hash.
More error handling improvements. Added developer debug mode.
More rework of feed item list to deal with missing feeds.
* offline: (247 commits)
Adding preferences for offline story limit and image download concurrency.
Better next unread button min width in narrow mode.
Fixing tooltip on Full view.
Speeding up new user queue.
Adding starred stories to munin.
Showing empty explainers.
Cleaning up starred story trimmer.
New starred story trimmer.
Turning off SSL verification on text importing.
Using latest feedparser.
Adding Xcode5-specific directories to gitignore.
Fixing crash on iOS 7 for offline stories. Still looks like shit.
Bumping feed blast limit from 50 to 100 stories at a time.
Need to pass story order and read filter to sync service when refresh triggered in AllSharedStoriesReading activity
Fixing autocomplete to not choke on missing feeds.
Fix#351 - support oldest first/unread for viewing all shared stories and individual blurblogs
Fixing spacebar and arrow keys for new scroll story list.
Normaling user agents between feed/page/icon fetchers. Adding full site permalink.
Fixing text view.
Fixing esc key to close popovers and menus without closing current feed.
...
Conflicts:
clients/ios/NSAttributedString+Attributes.h
clients/ios/NSAttributedString+Attributes.m
clients/ios/OHAttributedLabel.h
clients/ios/OHAttributedLabel.m
