# 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