* master: (24 commits)
Skipping google alerts.
Fixing a couple exceptions and turning off google news rss feeds temporarily.
Moving goodies images out of css. New ReadKit image.
Adding permalink blurblog option. Also adding feed title to unmessaged shares.
Moving from X-Real-IP to X-Forwarded-For.
Was using ad hoc and not in house provisioning profile.
Switching provisioning profiles again.
Switching to enterprise provisioning profile.
Fixing provisioning profile.
Putting out v2.4.4 as a RC.
Fixing friend user ids when marking stories as read.
Fixing auto-selection of feeds in feed chooser.
Moving to simpler read story endpoint.
Switching provisioning profiles for the year.
New enterprise build -> 2.4.4. Can be considered an RC1.
New notifier progress bar.
Adding messaging to training while offline in both trainer view controller and story detail view controller.
Users work while offline. Also adding messaging for offline sharing/replying errors.
Fixing mismatch when marking stories as read when offline.
Allowing single subscriber feeds to be seen, as it prevented tryfeeds from working.
...
* 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
# By Samuel Clay (2) and daanzu (1)
* master:
Fixing bug in autocomplete returning lost feeds.
Fixing issue where user agent doesn't exist.
Change crossover to narrow view from 700 to 720px.
* master:
Fixing issue where user agent doesn't exist.
Change crossover to narrow view from 700 to 720px.
Conflicts:
media/js/newsblur/reader/reader.js
* 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:
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
