Merge branch 'master' into circular

* master:
  If there are no unread stories in a folder, don't request river_stories with no feeds, since that will return all unread stories. Fetch all feeds in folder. Thanks to @afita for pushing this.
  Fixing sharing story by email if the story has no feed.
  Fixing sharing story by email if the story has no feed.
  Adding Tafiti, Windows 8 app, to logs.
  1 month max on next fetch.

Conflicts:
	media/js/newsblur/reader/reader.js

apps/reader/views.py

@@ -1489,7 +1489,7 @@ def send_story_email(request):
             message = "Email error: %s" % str(e)
         logging.user(request, '~BMSharing story by email to %s recipient%s: ~FY~SB%s~SN~BM~FY/~SB%s' % 
                               (len(to_addresses), '' if len(to_addresses) == 1 else 's', 
-                               story['story_title'][:50], feed.feed_title[:50]))
+                               story['story_title'][:50], feed and feed.feed_title[:50]))
         
     return {'code': code, 'message': message}
 

apps/rss_feeds/models.py

@@ -1242,6 +1242,10 @@ class Feed(models.Model):
         if self.is_push:
             total = total * 20
         
+        # 1 month max
+        if total > 60*24*30:
+            total = 60*24*30 
+        
         if verbose:
             print "[%s] %s (%s/%s/%s/%s), %s, %s: %s" % (self, updates_per_day_delay, 
                                                 self.num_subscribers, self.active_subscribers,

media/ios/Classes/FeedDetailMenuViewController.m

@@ -108,7 +108,7 @@
 {
     [self buildMenuOptions];
     int filterOptions = 2;
-    if (appDelegate.isRiverView || appDelegate.isSocialRiverView || appDelegate.isSocialView) {
+    if (appDelegate.isSocialRiverView || appDelegate.isSocialView) {
         filterOptions = 1;
     }
     

media/ios/Classes/FeedDetailViewController.m

@@ -117,7 +117,9 @@
         NSIndexPath *indexPath = [NSIndexPath indexPathForRow:[i intValue]
                                                 inSection:0];
 //        NSLog(@"Read story: %d", [i intValue]);
-        [indexPaths addObject:indexPath];
+        if (![indexPaths containsObject:indexPath]) {
+            [indexPaths addObject:indexPath];
+        }
     }
     if ([indexPaths count] > 0) {
         [self.storyTitlesTable beginUpdates];

media/ios/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist

@@ -32,7 +32,7 @@
    </FileBreakpoints>
    <SymbolicBreakpoints>
       <SymbolicBreakpoint
-         shouldBeEnabled = "Yes"
+         shouldBeEnabled = "No"
          ignoreCount = "0"
          continueAfterRunningActions = "No"
          symbolName = "objc_exception_throw"
@@ -41,7 +41,7 @@
    </SymbolicBreakpoints>
    <ExceptionBreakpoints>
       <ExceptionBreakpoint
-         shouldBeEnabled = "Yes"
+         shouldBeEnabled = "No"
          ignoreCount = "0"
          continueAfterRunningActions = "No"
          scope = "0"

media/js/newsblur/reader/reader.js

@@ -1469,6 +1469,9 @@
             var feeds;
             if (visible_only) {
                 feeds = _.pluck(this.active_folder.feeds_with_unreads(), 'id');
+                if (!feeds.length) {
+                    feeds = this.active_folder.feed_ids_in_folder();
+                }
             } else {
                 feeds = this.active_folder.feed_ids_in_folder();
             }

media/js/newsblur/reader/reader_send_email.js

@@ -43,10 +43,10 @@ _.extend(NEWSBLUR.ReaderSendEmail.prototype, {
             $.make('div', { className: 'NB-modal-error'}),
             $.make('h2', { className: 'NB-modal-title' }, 'Send Story by Email'),
             $.make('h2', { className: 'NB-modal-subtitle' }, [
-                $.make('div', { className: 'NB-modal-email-feed' }, [
+                (this.feed && $.make('div', { className: 'NB-modal-email-feed' }, [
                   $.make('img', { className: 'NB-modal-feed-image feed_favicon', src: $.favicon(this.feed) }),
                   $.make('div', { className: 'NB-modal-feed-title' }, this.feed.get('feed_title'))
-                ]),
+                ])),
                 $.make('div', { className: 'NB-modal-email-story-title' }, this.story.story_title),
                 $.make('div', { className: 'NB-modal-email-story-permalink' }, this.story.story_permalink)
             ]),

templates/mail/email_story_text.xhtml

@@ -13,4 +13,4 @@ Hello there! {{ from_name }} is sharing a story with you entitled "{{ story.stor
 
 --
 
-Sent from NewsBlur - www.newsblur.com - a visual feed reader with intelligence.
+Sent from NewsBlur - www.newsblur.com - a personal news reader bringing people together to talk about the world.

utils/user_functions.py

@@ -109,5 +109,7 @@ def extract_user_agent(request):
         platform = 'WP7'
     elif 'WP8' in user_agent:
         platform = 'WP8'
+    elif 'Tafiti' in user_agent:
+        platform = 'Tafiti'
     
     return platform