* 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: (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
* master:
Falling back to a POST request on river queries that have too many feeds.
Fix tabbing in previous commit.
Fix folder select clauses to always include root folder. Refactor selection clauses in general.
* master:
Trying to fix the unread counts ghosting issue by forcing an instant unread count refetch of active/selected feeds. This may work!
Fixing limits.conf to just use integers.
Making it a bit easier to setup a new db.
Updating Android app to v1.1 (revision 31).
* master:
Fixing port for real-time over SSL.
Fixing port for real-time over SSL.
Fixing broken CSS line.
Boosting feed fetches.
Premiums users with no active feeds should get all of their feeds activated.
* master:
Don't collide stories that are too short to be collided.
Fixing the long broken last update display on story titles header.
Fixing assortment of small bugs.
Allowing anonymous users to use statistics.
Handling previously read stories gracefully on unread count update.
Fixing updating of folder title when renaming. Thanks @afita.
Adding Metroblur to logging.
The 'm' key should only find oldest story, not also mark it read/unread. Typo? Thanks @donmelton.
