Commit graph

2 commits

Author SHA1 Message Date
Samuel Clay
ebb505e3f2 Merge branch 'offline' into ios6
* 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
2013-07-12 15:27:50 -07:00
Samuel Clay
bfff777490 Moving ios and android from media to clients. 2013-06-27 09:43:22 -07:00
Renamed from media/ios/Classes/ActivityCell.h (Browse further)