* master: (292 commits)
Fixing an infinite loop (!!) and focusing in on the comment textbox when sharing a story.
Fixing bug on empty river.
Use the selected feed view when viewing a story
Preventing multiple saved stories from being deleted. Also removing activities when removing saved stories.
Fixing accidental truncation on story when saved.
Fixing story detail height in Text view when saved with tags.
Fixing text tab view.
Updating readability.
Using https for twitter images. Adding a twitter photo sync to fix broken twitter photos. Thanks to @ggrappone for finding this one.
Counting dupe feeds only once in unread counts.
Fixing bookmarklet for NYTimes. Thanks to @rafeco for catching the bug.
Fixing bounce on resize.
disable debug
Mark-read idempotency for social feeds. (#460)
Idempotent mark-as-read DB ops. (#460)
Cleaning up unread counting. (#460)
Fixing height issues with new saved stories sideoptions box.
Limiting new user queue.
Limiting new user queue.
Max overlay fully fade slightly sooner when scrolling down. (#459)
...
Conflicts:
media/css/reader.css
media/js/newsblur/reader/reader.js
media/js/newsblur/views/story_titles_header_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:
Fixing a couple small bugs.
Fixing subs for socialsubs.
Fixing unread hashes on single feeds.
Fixing redis issue with existing keys beyond a RESTORE.
Fixing socialsub issue.
Adding options popover (and read_filter) to all shared stories and global shared stories.
Only trimming active users.
Fixing issue with wrong subs.
Fixing trim user stories on malformed story hash.
Fixing missig unread ranked stories cache.
Major refactoring of social blurblog. Also adding a new trimmer, but keeping it turned off.
Fixing rstats.
* master:
Fixing massive river bug where stories would abruptly end while paging.
Adding black logo.
Implement part of #207 - add Send To option to context menu in story list view
removed unnecessary and redundant imports.
Putting Google Alerts/News back into rotation.
Port pull request #219 to new repository layout. Adds https on Android to fix#165.
* 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: (24 commits)
Skipping google alerts.
Fixing a couple exceptions and turning off google news rss feeds temporarily.
Moving goodies images out of css. New ReadKit image.
Adding permalink blurblog option. Also adding feed title to unmessaged shares.
Moving from X-Real-IP to X-Forwarded-For.
Was using ad hoc and not in house provisioning profile.
Switching provisioning profiles again.
Switching to enterprise provisioning profile.
Fixing provisioning profile.
Putting out v2.4.4 as a RC.
Fixing friend user ids when marking stories as read.
Fixing auto-selection of feeds in feed chooser.
Moving to simpler read story endpoint.
Switching provisioning profiles for the year.
New enterprise build -> 2.4.4. Can be considered an RC1.
New notifier progress bar.
Adding messaging to training while offline in both trainer view controller and story detail view controller.
Users work while offline. Also adding messaging for offline sharing/replying errors.
Fixing mismatch when marking stories as read when offline.
Allowing single subscriber feeds to be seen, as it prevented tryfeeds from working.
...
