* master: (470 commits)
Better handling of tweepy errors.
Truncating more of the body due to payload size limits.
Accidentally marking stories in active feed as read when marking other feeds as read.
New experimental data collector for debugging feeds over time.
Fixing broken notifications for people with no notifications.
Fixing a couple Twitter and YouTube fetch issues.
iOS v7.0.0 testflight beta.
Gotham is the new default font.
Notifications should start at the top on every open.
Fixing notification popover placement on ipad.
Fixing crash when remvoing multiple notifications at once.
Fixing all ios8 warnings. v7.0.0 is ready to go to TestFlight!
Moving to UIAlertController. Got a bunch more.
Upping redis timeout to handle possibility that users are still losing their tokens.
Fixing warnings.
Fixing styling on notifications titles.
Fixing notifications on ipad. Notifications are also now updated after saving.
Attempting to allow both old form and new form lists in parameters. looks[]=like&looks[]=this instead of looks=like&looks=this
Feed ids is a list.
Handling new style list parameters.
...
* master: (75 commits)
Adding template for Turn Touch end campaign email.
Fixing images in email notifications.
Bingo, found a bug when marking odler stories as read in a folder.
Updating fonts.
Android v5.1.0b1.
Turning S3 back on.
enroll more debug logging
enroll more debug logging
fix log levels, enroll more debug logging
enroll more loggin in feedback logger
enroll more logging in feddback system
log capture and email reporting
Adding failure handling for boto.
Fixing horrible session loss bug. Turns out the django-redis-sessions library changed timeout behavior, from silently retrying to silently failing. Adding necessary SESSION_* vars.
Better handling of booleans on /reader/feeds.
Fixing redis bootstrap
Add Firefox to story browser list
Dashboard should not show old stories.
Faking user agent when rss bans NewsBlur.
Better recording of non-200/300 status codes on feed fetch.
...
* master: (801 commits)
Fixing styling of tags and font sizing in story header on web.
Use ReadingAction for mute/unmute.
Fixing drag on saved stories and social stories. Also fixing background color on profile activities.
Fixing username sizing on blurblog. Thanks to J. Leeuwen for finding this.
Fixing bug when deleting feeds.
Adding preference for left-swiping feed titles to either show notifications (default) or trainer (old default).
Alphabetizing notifications.
Saving notifications on iOS. Just need to update local feed dict on save.
Mutli select segmented control. Now just need to save and we're done.
Selecting correct notification filter. Notification type will need a custom segmented control to handle multiple selections.
Finished styling notifications on ios. Needs web hookup.
Feeds are now loaded in notifications table. Now to build the cells and save notification types.
Stubbing in notifications table. Now needs notification feed cells.
Stubbing in notifications editor on iOS.
Hiding notifications from non-staff on web in feed popover.
Android v5.0.0b2
Fixing date/author/tags size on web.
Only include active feeds when marking a folder as read.
clarify ambiguous preview option
fix story row bordering (#963)
...