* 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: (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
* master: (26 commits)
Fixing unknown host error on DO servers.
Using All Site Stories instead of Top Level on folder chooser.
Adding new preference for auto-opening a default folder on load.
Unread counter overlay widget for feeds and social feeds.
Fixing memory leak when reloading feeds (after add/remove/move), found entirely through @mihaip's hard work. Thanks!
Disallowing single subscriber feeds to be loaded by non-subscribers.
Fixing #383. Need a way to retrieve starred stories by hash.
Previous story button takes you up, no longer to previous story. Should've done this a while ago.
Adding story intelligence score tip to API.
Adding user_profile to /reader/feeds. Has is_premium field, as well as web preferences.
Switching feed link to point ot the feed's permalink, not a feed filter on the blurblog.
Preventing popular from sharing stories from the same feed id in the same batch.
Upping delay on new user queue.
Fixing jenny holzer quote at end of blurblogs.
Adding better error logging/messaging for marking stories as starred.
Adding better error logging/messaging for marking stories as starred.
Fixing broken icon bug.
Fixing missing user_id in comment's replies and likes.
Posting popular shared stories to twitter.
Boosting shared stories on popular.
...
Conflicts:
apps/reader/views.py
* master:
Only turn real-time feeds into lazy feeds if there is a track record of push notifications.
Switching Email Story menu item to show email icon.
Turning off redis dupe story id writer.
