* master: (28 commits)
Limiting new user queue.
Adding user agent. Still needs version name from Manifest. @dosiecki or @manderson23, either of you know how to get that version name (like 3.5.5) into the user agent?
Android v3.5.5. Bumping minimum SDK to v11 (3.0+).
Fixing broken BBC links which have oddball hashes.
Fixing links with target hashes.
Refactor story loading to persist during list/reading activities.
Make new async calls not race UI threads.
Essentially stripping photos of size.
Android v2.5.3.
Fixing colors and transparency on android story traversal buttons.
Fixing image scaling.
Fix story loading not to keep paging on error.
Android v3.5.2
Remove comment cruft.
Replace requery with cursorloader in Reading.
Handling different scroll views.
Fixing footnotes.
Bumping android version.
Fix crash async crash.
Clean up sync cruft. Add sanity break in pagination loop.
...
Conflicts:
assets.yml
media/js/newsblur/views/story_detail_view.js
media/js/newsblur/views/story_list_view.js
media/js/newsblur/views/story_title_view.js
* master:
Fixing mark as read when disabling double clicks.
Android v3.5.
New preferences: double-clicking site titles and unread counts.
Fixing the default PuSH lease by setting it to 10 minutes (matching the reference hub). Huge thanks to @mihaip.
Now forcing image sizing.
Switch remaining story loading to new async model.
Switch folder reading and All Stories reading to new async model.
Move saved stories fetch to new async model.
Generalise handling of story request responses.
Update some auto-gen cruft that recent tools fixed.
Switch social feeds to new async system.
Fix some async crashes.
Update to API level 19!
Update to API level 19!
Fix crash on async callback in reading fragment.
Initial decouple of feed story sync from sync service. Buggy.
Conflicts:
media/js/newsblur/views/feed_title_view.js
* master: (40 commits)
Version 3.6 of the iOS app.
Fixing tolerance on drag bar.
Fixing switch between story titles on left and on bottom.
Cleaning up after failed backup.
Fixing disappearing righttoolbarmenu icons. Adding preferences for urls to use in-app browser, safari, or chrome.
Fixing transition cancelation on interactive swipe on ipad.
Fixing rotation issues, as well as premature hiding of dashboard on animation on ipad.
Fixing interactive transitions.
Fixing many issues with transitions on the ipad. Still need to fix the interactive transition completion.
Fix#441 - changing text size needs to call evaluateJavascript instead of loadUrl when targeting SDK >= 19
Fixing swipe-back on ipad for transitioning b/w feed list and feed detail.
Fixing paddings on story titles.
Resizing user avatar.
Adding option for side swipe in story detail.
Android v3.0.1.
Fixing cutoff date when retrieving stories.
Mark older/newer stories as read.
Fixing issue with autocomplete.
Fixing infinite loop.
Trying out better autocomplete search with parts.
...
* master: (38 commits)
New Play Store image assets.
Fix layout bug on small screens.
Revert "Updating stories which give integrity errors."
Fix laggy updates for saved stories unsave ops.
Ability to unsave stories.
Make height of saved stories row match other folders.
Make rows reliably hilight when tapped. (#282)
Allowing replacement of story dates on integrityerror updated stories.
Swapping errors.
Updating stories which give integrity errors.
Fixing margin on subscribe/follow taskbar button.
Upgrading Android Studio.
Fixing #261. Decoding html entities in story titles (both in the share dialog and in the story detail view).
Flattening gradients on feed and story selection. Adding colored background back in to selected river stories.
Fixing modal resizing. Thanks to @tomtaylor for finding the broken dialog.
Remove unused ABS progress indicator support for reading view.
Implement #426 - preference to show/hide public comments
Pressed state for overlay_done button.
Pressed states for all overlay buttons.
Fit overlays on 360dp screens. Move progress indicator to overlay. Add progress indicator for text mode.
...
