* muserstory_remove:
Adding node group to fabfile.
Using popular instead of homepage user to suggest new users to follow.
Cleaning up unused detritus. Ready to deploy.
Final cleanup before deploying.
Removing MUserStory entirely.
* ruserstory:
Adding real-time update on marking feed as read.
Remvoing unused everything_unread param from river stories.
Using story_hashes instead of fetch_stories parameter.
Moving read stories over to RUserStory when merging feeds.
Cleaning up MUserStory imports.
Speeding up blurblog sub counter b yonly using unread stories instead of all stories since a certain date.
Speeding up unread story counts.
Speeding up unread story counts.
Adding force calculate sub scores option.
Showing starred and shared status on global/river blurblog.
Fixing global feed to show read stories.
Fixing reading stories in river blurblog.
Moving river blurblog to no longer use MUserStory.
Adding MUserStory back in when reading and unreading, to maintain backwards compatibility.
Fully converting feeds and folders to use redis-only read stories (removing MUserStory). Still need to do socialsubs.
Conflicts:
apps/reader/views.py
apps/social/models.py
* master:
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.
Updating Android from v1.3 to v1.3.1, fixing duplicate All Site Stories bug.
Conflicts:
apps/social/models.py
* 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
