* master: (81 commits)
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.
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.
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.
...
Conflicts:
fabfile.py
* master: (73 commits)
Updating iOS for iOS 6 and the new iPhone 5.
Fixing typos in iOS app.
Fixing a bunch of feed fetch errors.
Fixing these damn Link: text urls in story modifications.
Unloading the story iframe when changing feeds.
Fixing sent emails for new premiums.
Adding folder collapse for blurblogs.
Forcing all munin graphs to start at 0.
Ordering and smoothing munin graphs.
Showing total fetches in task munin graph.
Deprecating FeedLoadtime and moving to MongoDB-backed aggregate data for feed load time graphs.
Cleaning analytics as a beat task. Fixing server status codes in munin, and removing app feed fetches from analytics.
Fixing paths munin.
Normalizing paths and adding graphs for browser breakdowns, paths, and task feed status codes.
Permissions on munin.
Fixing typo in munin task config.
Changing munin names for better graphs.
New Munin views: task server breakdowns by feeds fetched, total time taken per server, and aggregate stats in the pipeline.
Fixing JS issues around stories with no feeds clobbering the river view.
Finishing off new feed selector. Now scrolls to matched feed, correctly loads top feed, handles errors, and handles esc.
...
Conflicts:
.gitignore
* master: (1098 commits)
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.
Upgrading to jQuery UI latest to fix slide animation on window panes.
Splitting up dashboard into unauthed and authed templates, needed to redesign to unauthed view.
Adding collapsed folder icons.
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.
...
Conflicts:
.gitignore
