* 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.
# By Samuel Clay (2) and ojiikun (2)
* master:
Adding node group to fabfile.
Fix crash on empty use pictures.
Correcting for feedburner stupidity.
Auto-sync the feed/folder list if it has been more than 10 minutes since the last refresh.
# By Samuel Clay (1) and ojiikun (1)
* master:
Correcting for feedburner stupidity.
Auto-sync the feed/folder list if it has been more than 10 minutes since the last refresh.
# By Samuel Clay (4) and ojiikun (1)
* master:
ES requires valid url.
Overriding haystack elasticsearch url.
Removing Redis autocomplete. Upgrading elasticsearch.
Using haystack and elasticsearch for a third autocomplete feature.
Refactor/fix mark-as-read-while-reading workflow.
* master:
Removing sparse constraint on MStory's story_hash index. Goodbye old stories that didn't make the cut.
Adding optional force param to sub counter.
* 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 credit card images. Doh\!
Upping feed fetching.
Removing random interval in feed fetches.
No longer random intervals for dead feeds.
Fixing mark as unread in redis hash migration.
Fix group type caching in FolderList, and much refactoring for readability therein.
Remove special All Stories group and make the now-visible root folder perform it's function.
Formalize top-level folder name workaround.
Nonfunctional refactoring in list adapter (unused vars, method visibilities, annotations).
Fix an initialization edge case in creating column/resource ID mappings.
Fix regression in API to get /reader/feeds and set update_counts to true.
Factor out duplicate code in APIClient to ensure parameterized GETs behave like bare GETs.
Refactor FolderListFragment and associated Adapter.
Fix bad merge.
Remove accidentally added swapfile.
Removed missing root feed workaround. Refactoring FolderListFragment for readability.
Clean up parsing of /reader/feeds response and work around problems with empty-named root folder.
Fix NPE crash when adding new feed.
Conflicts:
apps/rss_feeds/views.py
