* master: (28 commits)
Limiting new user queue.
Adding user agent. Still needs version name from Manifest. @dosiecki or @manderson23, either of you know how to get that version name (like 3.5.5) into the user agent?
Android v3.5.5. Bumping minimum SDK to v11 (3.0+).
Fixing broken BBC links which have oddball hashes.
Fixing links with target hashes.
Refactor story loading to persist during list/reading activities.
Make new async calls not race UI threads.
Essentially stripping photos of size.
Android v2.5.3.
Fixing colors and transparency on android story traversal buttons.
Fixing image scaling.
Fix story loading not to keep paging on error.
Android v3.5.2
Remove comment cruft.
Replace requery with cursorloader in Reading.
Handling different scroll views.
Fixing footnotes.
Bumping android version.
Fix crash async crash.
Clean up sync cruft. Add sanity break in pagination loop.
...
Conflicts:
assets.yml
media/js/newsblur/views/story_detail_view.js
media/js/newsblur/views/story_list_view.js
media/js/newsblur/views/story_title_view.js
* master:
Fixing Underscore in bookmarklet to handle sites with window.exports functionality, which breaks _. Thanks to @kyleniemeyer for finding the bug.
* master: (589 commits)
Adding delete user flow. About time, since I'm sick of doing this myself.
Deractivating premiums.
Adding a lock for the intelligence slider for focus stories. If the user selects focus and there are actually focus stories, lock it for the future when there are no unread focus stories.
Uppiung the find next unread story titles page limit from 12 to 50.
Hiding folders with no unread stories in Unread/Focus mode.
Adding autocomplete to emailing a story dialog.
Using queue for scheduling feed fetches on load.
Renaming celerybeat supervisor task.
Fixing insta-fetching.
Attempting to correctly save duplicate feeds.
Adding tons of logging (especially user-facing) to feed exception handling. Much much better feed address and link fetch history.
New enterprise ios build includes full training.
Changing intelligence training on social feeds to apply to original feed as well.
Using a popover for training on the iPad. Also adding the train button to the bottom of every story.
Finishing training on iPad. Works in river too. Just need to test social and it's shipping.
Fixing title selectin bug when the title was too short to register the selection loupe.
Training feeds and stories in feeds. Needs testing on ipad, in river, and on social.
Finish look and feel of ios training for both story and feed. Just need to send requests, redraw intelligence, recount and reclassify stories, and update scores. All already written to support inline training.
A few more log color tweaks.
Adding clean stories task. Updating log colors.
...
Conflicts:
.gitignore
apps/reader/views.py
apps/social/views.py
templates/social/social_page.xhtml
templates/social/social_story.xhtml
templates/social/story_comments.xhtml
* 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
