* original_pages_node:
Preparing original pages node server for launch.
Removing unused original pages from S3 when stored on node server.
Refactoring original page saving toa ccount for node server being down.
Using S3 as a backup for node original page server.
Removing originals. Meant to put in a db.
Moving original pages to a node server from s3. Still needs conversion from s3.
* 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' of github.com:samuelclay/NewsBlur:
Changing 'Read It Later' in user-facing strings to 'Pocket' and updating URLs
Re-wrote new user e-mail
Changes to About page copy
Remainder of FAQ re-writes
Re-wrote answers for FAQ
Focus on Helvetica Neue/Helvetica (default), Lucida Grande/Sans, DejaVu/Bitstream Vera/Verdana, Open Sans/Liberation Sans, and a sane high quality serif font stack.
* 'master' of github.com:samuelclay/NewsBlur:
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.
* 'master' of github.com:samuelclay/NewsBlur:
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.
* 'master' of github.com:samuelclay/NewsBlur: (32 commits)
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.
Reducing queue size of push feeds when overloaded.
Showing tags, authors, title, and publisher, but only for stories. Needs to be hooked up to send to the server, redraw, and handle site training and popular tags.
Showing maintenance mode message. One day ... put in a live chat.
Preventing the double tasking fo feeds.
Preventing the double tasking fo feeds.
Migration to increase max length of feed address.
Cleaning up task feeds logging.
Stubbing in new modal trainer for ios.
...
