* master:
Adding a preference to notification title only.
Adding in preference to only send full title in iOS notifications.
Forgot primary state
Adding replset oplog timing to db monitor.
* docker_django3.1: (117 commits)
Adding docker to node scripts.
Removing node_modules from repo
Whoops
Better logging for broken paypal ipns.
Adding RSS Tracker for Windows to Goodies.
Refactoring socketio so real-time works around username restrictions.
Socket.IO v3 on the server too.
Switching to Socket.IO v3.
Haproxy splitting for socketio 3
Socket.io 3
Handling missing feed.
Only nb.local.com uses ports for websockets.
Adding GrazeTEN
Full node install on setup.
Updating toprc
correct newsblur to newsblur_web in tasks
Changing mongodb server.
Fixing toprc
Attempting to collect queries for 1% of requests by using DEBUG.
Fixing mongo install.
...
* 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.
...
* django1.7: (66 commits)
Styling new features for dark mode.
Adding style option for grid height. XS/S/M/L/XL
Adding applinks to .well-known/apple app json. For #1361.
#1377 (mark as read for titles only)
iOS: project upgrade check
https for all links.
Saving saved story slugs.
Slugifying saved story tags that have no slugs.
Adding ssl to db machines.
Fixing subscription cancelation error messge.
Android v10.1b7.
#1364 In App Review
Showing addresses in email story share.
#1369 Notification alerts. Skip old stories
Android v10.1b6.
iOS v10.1.1.
Fixing backgrounds in newsletters.
Fixing newsltter check which inaccurately added newsletter div to all stories.
Styling side option buttons in iOS to be cleaner.
iOS v10.1.
...
* django1.7: (102 commits)
Beginning fix of rss_feeds unit tests.
Fixing unit test for profile app and signup.
Remove highlights count when it reaches zero.
Android v10.1b1.
Stubbing in profile tests.
Adding nginx.local.conf
Adding original text and original story to API docs.
#1282 Adding feed to root folder
#1319 In app and external browser options
Adding a smarter wakeup for real-time to handle cases where a laptop is re-opened but real-time is not immediately reestablished.
#1348 (scroll indicators theme)
#1344 (search loses focus)
#1335 Auto theme option for OS level dark mode
Fixing signup flow.
#1347 Show pager with stories after using the intel trainer and refreshing
#1272 Load HTML in comments
New icon for Infrequent Site Stories.
Allowing selection in private notes.
Autoresizing private notes field.
For #1035: Adding private notes to saved stories.
...
* master:
Stubbing in profile tests.
Adding nginx.local.conf
Adding original text and original story to API docs.
Adding a smarter wakeup for real-time to handle cases where a laptop is re-opened but real-time is not immediately reestablished.
