* story_hash_2:
Another bug found by @kyleniemeyer's story. a - b was supposed to be b - a.
Fixing Global shared stories by checking for missing story hashes properly.
Using index in msharedstory search.
Using new story_hashes instead of story object ids.
Conflicts:
apps/social/models.py
* master:
Fixing story hash migration to run by user.
Adding story_hash to starred stories, user stories, and shared stories.
Adding redis backup script.
* master:
Fixing huge bug in mark_feed_read for socialsubs.
Increasing logging on read social sub stories.
Shift+a to mark as read for blurblogs.
Shift+a to mark as read for blurblogs.
Marking as read covers both socialsubs and feeds.
Conflicts:
apps/reader/views.py
# By ojiikun (8) and others
# Via Samuel Clay (3) and ojiikun (1)
* master:
Handling 0 images found for shared story.
Fixing broken JPG image sizer.
Handling timeouts for feed link change.
Fixing a few small feed collision errors.
Adding feedparser trunk, in case I want more pain.
Fixing feed address change by feed link when colliding with existing feed.
Fixing feed address change by feed link when colliding with existing feed.
Revert change that disabled user images for shared/commented on a story and liked comments
Undoing whitespace changes in APIManager.
Undo whitespace changes in APIClient.
Fully remove redundant sync during login.
Remove extra debug. Add full API logging.
Cleanup comment views.
Prevent force close in SetupCommentSectionTask if there is no data in the reply user cursor.
Added .gitignore so ant files aren't accidentally comiitted.
Clarify shell HOWTO instructions.
Added shell build HOWTO.
Remove extra sync in login frag. Disable favicos. Better Debug.
* master:
Warning on missing maintenance.
Further pushing out feed updates.
Using @dcramer's excellent getsentry.com for all exceptions. Turning off exception emails.
Further pushing down feed fetches to handle load until db is scaled out.
Scrolling code blocks.
New task servers.
Turning down feed fetches.
If requests.raw won't work, sut fudge it with a StringIO for now.
Further turning down feed fetches until mongo is ready to replicate.
Fixing Facebook image calculation.
Fixing facebook posting.
Moving shared story unread recalc to background task. Will greatly speed up sharing.
Ramping down feed fetching until they can be handled.
Only show time breakdown when > 1 sec.
Fixed API docs for /reader/river_stories
make fabfile.py use requirements.txt
Make sure to send the proper content-type with social feeds
Restore default whitespace to pre/code blocks
Phase 2: switching to using story_hash index instead of compound unique story_feed_id/story_guid index.
document keyboard shortcut to add site/folder
Conflicts:
apps/social/views.py
* 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
