* 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.
* master:
Changing story scroll offset on blurblogs.
Fixing blurblog scrolling on iphone. Fixed offset of folder menu. Changing modal shadow.
Launching read folder with All stories and not just unread stories.
Oldest first goes back two weeks on all stories.
Using mark_read_date in all stories read_filter by folder.
Fixing all read_filter for folders by including hidden feeds. Also marking stories beyond the unread cutoff as read, hoping the redis store of read stories takes care of the rest.
Speeding up All Site Stories. Also beta-ing river with read_filter of all (not just unread).
Launching Text View.
Paging in text view when on temporarily. Also auto-selecting first story when temporarily opening text view.
Fixing two small bugs in text view.
Hiding text view for non-staff.
Fixing the last of the state errors on text view. Should be good to ship.
Adding a white fade to text view for non-premium.
Adding premium requirement for Text view.
Temporarily loading text view on shift+enter. Adding keyboard shortcuts.
Fitting story count floater, and then hiding it when it doesn't fit entirely.
Selecting first story in text view in folders. Showing unread count floater even in text view.
Correcting a few glitches in text view. Shaping up nicely. Just need premium only.
Showing the story we do have when text view fails.
Text view. Needs a few tweaks and a premium only view.
* master: (28 commits)
Adding logging to photo uploading.
Undoing some broken changes on reading.
Adding avatar photo uploading.
Moving bakc to Verdana for Windows font. Ugh, this has to be fixed somehow.
Fixing deactivation of expired premiums.
Forgot password flow. Holy crap, this took two years.
Bumping up duplicate address length for feeds.
Submitting v1.8 to iOS App Store.
Fixing db firewall ports.
Preparing original pages node server for launch.
Adding font size choices to web preferences.
Closing #66 with both integration of #68 and using the same fonts. Users can add an optional class if they want these other convenient fonts. Also using a few fonts as backups for non-Mac users.
Fix default theming hook
Add multiple targeted font stacks
Fixing #75: shared stories should use story permalink, not story guid. Doh. Thanks @denubis!
Categorizing preferences. Adding window title count back in.
Adding email lookup to forgot password flow.
Adding email lookup to forgot password flow.
Removing unused original pages from S3 when stored on node server.
Refactoring original page saving toa ccount for node server being down.
...
* master:
Fixing typo in logging.
Fixing autocomplete behavior on add dialog.
Adding broken search for feeds.
Logging
Switching to guid-based read story counts from range based counts. Let's see what this screws up.
Everybody gets unread count in title.
Backporting collections.Counter to python2.6
Fixing broken reply interaction with links.
Prototype of a dupe checker using real-time update times to figure out which feeds are the same. Last time I walked down this road I got run over.
* 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: (107 commits)
Adding scroll to comments button to share bar. Thanks @afita.
Turning off microformats for more errors.
Fixing errors in timeouts to show the correct error. Also fixing microformats parsing issue and allow IPv6 URLs in enclosures to be ignored, fixing a bunch of feeds.
Cleaning redis stories for 1% of all feed fetches.
Refreshing feed on fetch.
Fiddling with logging on dupe feeds.
Adding bs facebook assets.
Better to push together than to spread apart. Diffing html is hard.
Changing logging colors for social activities.
Delaying Paypal return, fixing privacy css, and adding convenience function.
Adding esc shortcut key in keyboard shortcuts. Also turning on privacy features for public beta testing.
Fixing the missing story titles bug. Turns out it happens when a story title is loaded twice but the reuslting map contains an undefined, which nullifies the rest of the stories. Doh!
Fixing hostname for Firefox content handler.
Adding share info to saved stories.
Revert "Failing marking a story as read in ios now shows an error."
Failing marking a story as read in ios now shows an error.
Consistency b/w ios and web for unsaving a story.
Adding unread counter to All Sites.
Allowing regular users to change read_filter on socialfeeds.
Changing icons on welcome page.
...
* master:
Fixing email reshare for stories with missing feeds.
Fixing raven client on feed fetchers.
Moving to better feed finder (in the case of dupe feeds).
Adding timeout errors to raven/sentry error reporting.
Fixing an uncaught exception around feeds that change ids.
Handling broken s3 original pages.
* 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
