* master: (72 commits)
Missing import
Correctly decoding shared stories in RSS feed.
Adding scroll to feed and story options popover (Style menu).
Magazine view blog post.
Refactoring story content preview with newlines preserved.
Boosting db profiling from 1% to 5%.
Ignore data uris for widget, they are never the big images
Wait to strip data uri header until it's time.
Moving encoding
Don't double encode base64 images for widgets.
Preserving paragraphs in magazine and grid views.
Fixing bad instrumentation on mongo and redis logs.
Wrong url for db profiler.
Let's try showing only single feeds in the DB profiler to see if it's better at showing abnormalities with less noise.
Fixing strict bug where wasn't defined.
Showing grid image previews. Not sure how this ever worked before.
Grid has image if found already.
Showing grid image on load if youtube
Only monitor river_stories for db times
Not hitting a db shouldnt be colored any differently than a small value.
...
* master: (31 commits)
Adding postgres backup log.
Handling operation failures in flask metrics.
Locking consul to a working version. Also changing flask status code response to handle custom status codes.
Explicitly uploading mongo backups
Only need date once in filename
Rotating mongo backups
Using full path for progress.
Showing full path of postgres backup.
Separating out restoring backups and storing backups.
Moving to postgres backup directory.
Executable postgres backup script.
Compressing Postgres db sql backup.
Adding date to tarball to allow for versioning.
Correcting permissions on mongo backup
Fixing mongo upload to s3 by using host networking mode.
Removing unused backup code.
Forgot import
Adding progress bar to mongo backup.
Refactoring aws keys for mongo backups.
Moving mongo backups
...
* dashboard:
Removing imperfect proxy warning for every story.
Found four more GET/POST crosses.
Sizing of right column
Folder colors.
Goodbye uppercase everything.
Cleaner highlighted site.
More color
More color
Cleaner highlighted site.
Attempting to add story opening for dashboard, but broke saved searches.
Turning off queueing for dashboard stories.
Individual dashboard rivers. Need support for opening stories and limits.
Stubbing in new dashboard river modules. Needs hooked up and needs module-specific options. Would also be nice to add density controls.
* django1.11: (220 commits)
Fixing Statistics by fixing how timezones are handled.
Checking the 'credit' field if author not found. Works for TechRepublic, which I suspect is a one off.
Handling multiple newsletter feeds.
Attempting a fix of stories taking too long to sort while counting unreads.
Fixing newsletter search.
Fixing newsletter search.
Newsletters feeds now de-duplicate based on sender email as well as sender name. This should cut down on duplicates.
Android v10.1.1.
Fixing API page.
Ignoring cache for homepage user.
Fixing both Stripe form and Login form.
Handling missing user during auth.
Gotta recreate empty_values somehow
Going back on AllowAllUsers backend, as it doesn't work with django 1.5 authentication sessions.
Going back and forth on this but without AllowAllUsersModelBackend, then is_active=False won't allow authentication.
De-vendorizing django-paypal
Vendorizing paypal
Re-vendorizing django-paypal until django 1.11 upgrade is complete.
Wrong fix for missing tagline. SHould instead create a FeedData.
Fixing missing tagline error.
...
