* master:
Upgrading iphone/ipad app to support both ios 6 and tall-iphone.
New folder options: add subfolder.
Adding location to find friends.
Trimming mongodb lag cutoff to force feeds to correct themselves when slave lag becomes an issue.
Fixing 'r' refresh command for All Site Stories.
Fixing broken social page.
* master: (39 commits)
Ignore skip of unread counts if theres no mongodb lag.
Adding readability vendorized package.
Adding two new functions for stories: collect image sizes and grab original article text. Useful for future features.
Being stricter about non-english characters.
Fixing popular story algorithm to remove non-english stories.
Fixing follow user on blurblogs. Abstracting unshare so I can more easily unshare.
Fixing trainer for stories in social feeds.
Fixing small bug in story titles header now showing socialsubs correctly.
Fixing headers for Everything river and river blurblog.
Massive refactor around feedbar, brought on by @afita, in order to give Folders a menu in the story titles header (and then make the mark as read button work on folders in the header.)
Updating story position in closed story titles when pane is re-opened. Thanks to @afita for the bug.
Updating to altest jQuery layout.
Adding folder story counts to content pane. Thanks to @afita for the suggestion.
Fixing activities bug when the user is unknown and there is no source/with_user.
Calculating correct page fetch timing offset (if it was a 304).
Adding server name and feed code to analytics.
Turning analytics logging back on.
Temporarily commenting out analytics to see if they cure the slow down.
Shortening names on analytics for improved space saving.
Adding new analytics collections to keep track of page loads and feed fetches. Need to start aggregating before I can tell how useful this data will be.
...
Conflicts:
apps/social/models.py
media/js/newsblur/social_page/social_page_assets.js
* master: (46 commits)
Tweaking right-click on feeds and upping ratelimit.
Fixing broken menus.
Simplifying top dashboard button.
Fixing audio handler for Firefox.
Fixing right clicks and updating team.
Encoding utf-8 strings into bytecodes so lxml doesn't choke.
Fixing ghost unreads by accounting for the implicit score of 1 in unsorted sets in redis when intersected with a sorted set. Doh!
Fixing errors in story training classification on social subs.
Fixing double-activities bug.
iPad/iPhone splash page, redone for the new iPad app.
Traverse folders if using Next Unread in folder view.
Fixing issue with top-anchored story titles list and story marker position. Thanks to @afita for the persistence.
Opening site after adding it.
Attempting to fix user exception dialogs.
Using parent folder to update all parent folders on read story.
Using correct bookmarklet css.
Fixing bug I've been tracking down for a while. Following an activity on a user you don't follow now correctly shows a tryfeed. Thanks to @afita for the great find!
Fixing Youtube embeds and correctly handling keyboard events when share is in transit.
Adding support for YouTube and Vimeo video embeds in share bookmarklet.
Correctly stripping tags from titles in shared stories.
...
Conflicts:
templates/social/social_story.xhtml
* master:
changing entitlements
adding in recompiled ipa
adding new ipa
aadding in new ipa url
Adding logging for downloading enterprise ios app.
Adding MIMEtypes to .ipa and .plist for iOS app.
adding ipad
adding in new plist
Adding iOS app download for enterprise distribution.
adding enterprise ipa
Adding days arg to popular stories to grab even more.
