* 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.
...
* master: (115 commits)
Fixing ios images. Submitting v3.5.
Fixing mongo btree munin graph.
Adding Swift Reader to Goodies.
Speeding up scrolling on feed list.
Support navigating back to home page from action bar in Preferences
Redrawing intelligence slider on ios.
Normal profile.
V3.0.4 (RC3)
Massively speeding up the viewWillAppear on the feed list.
RC2 (or is it RC3 by now?) of iOS app.
Fixing a crash on mark read.
Fixing broken story page control.
Adding Pinterest.
Tightening up comments line height.
Fixing bug around loading feeds when there's no offline db.
Correctly render DB changes in folder list more quickly.
Fixing empty story hashes.
Cleaning up kill utils.
Fixing hiding and showing of notifier on fetch.
iOS7 app RC2
...
* master: (30 commits)
Fixing search positioning on saved stories.
Fixing positioning of popover options in All Site Stories.
Adding Split tooltip.
Removing extra logging.
Switching feedbar and navbar.
Fixing mark folder as read.
Removing double.
Fixing mark as read on socialsubs.
Adjusting positioning on new feedbar. Also scrolling to selected feed/folder when switch story layouts.
Reloading feed list when adding, moving, and deleting feeds and folders.
Reloading feeds on feed/folder add and feedchooser.
Backend for marking feeds/folders as read at a specific timestamp.
Adding expanded mark read buttons. Needs backend support.
iOS v3. Fixed move site view folder placement as well.
Moving feedbar down to bottom of screen. Prep for new mark read buttons.
Fixing 2 ios crashes: double-tapping instapaper button and a weird keyboard condition.
Fixing activities height for subscriptions on ios. Also turning river back on for third-party clients. That wasn't fair and it's hard to get users to upgrade. I'd rather give users the ability to use the product instead of crippling it, unless there is a proper workflow for upgrading, which only exists on the web today.
Removing last traces of Google Reader from ios app. Also add better final page of ftux. Fixing folder chooser in add dialog on ios.
Fixing colors on share/train buttons when active. Fixing height on profile cells.
Stopping animation of share view/keyboard before orientation has changed.
...
Conflicts:
media/js/newsblur/views/story_titles_header_view.js
