* master:
Publishing realtime update when marking feed as read, only if it was actually marked as read.
Turning off real-time on mark_feed_as_read. Too much!
# By ojiikun (3) and Samuel Clay (2)
* master:
Fixing hashes only call on folders.
Handling another unicode decode issue in uploaded OPMLs.
Make Story.read a boolean rather than an int.
Upper limit on mark-read batch size auto-flushes.
Remove forced sleep suspected of causing null activity access in fragments.
# By ojiikun (3) and Samuel Clay (2)
* master:
Fixing hashes only call on folders.
Handling another unicode decode issue in uploaded OPMLs.
Make Story.read a boolean rather than an int.
Upper limit on mark-read batch size auto-flushes.
Remove forced sleep suspected of causing null activity access in fragments.
* 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.
* 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:
cleanup and fixing some of my stupid bugs
cleanup and fixing some of my stupid bugs
whoops, that section isn't called in the normal installation process. Reverted.
Fix to make detecting if the install is a dev env work properly
Fixed typo. Also, extracted most of the instances of a specific username out to `env.user`, so you don't need to search&replace to do an install. Lastly, added a separate function to change the shell of the host, so it's easier to disable.
Conflicts:
fabfile.py
# By Fake Name
# Via Fake Name (2) and Samuel Clay (1)
* master:
cleanup and fixing some of my stupid bugs
cleanup and fixing some of my stupid bugs
whoops, that section isn't called in the normal installation process. Reverted.
Fix to make detecting if the install is a dev env work properly
Fixed typo. Also, extracted most of the instances of a specific username out to `env.user`, so you don't need to search&replace to do an install. Lastly, added a separate function to change the shell of the host, so it's easier to disable.
