Commit graph

4481 commits

Author SHA1 Message Date
Samuel Clay
6b384b51a2 Removing unused types key from index. 2021-01-06 18:00:55 -05:00
Samuel Clay
f5b144f22f Merge branch 'docker_django3.1' into dashboard3
* docker_django3.1:
  Ignore send_message_with_response if not available (for some reason).
  Updating to latest pymongo and mongoengine for py2.
2021-01-06 16:39:23 -05:00
Samuel Clay
30828e8291 Merge branch 'master' into docker_django3.1
* master:
  Ignore send_message_with_response if not available (for some reason).
  Updating to latest pymongo and mongoengine for py2.
2021-01-06 16:39:00 -05:00
Samuel Clay
a1f4d67d27 Changing how tasks are called. 2021-01-06 14:42:24 -05:00
Samuel Clay
4432f836a3 Another newsblur > newsblur_app. 2021-01-05 19:49:24 -05:00
Samuel Clay
82fecb23a6 Merge branch 'docker_django3.1' into dashboard3
* 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.
  ...
2021-01-05 19:36:49 -05:00
Samuel Clay
6e07dbaf0f Merge branch 'master' into docker_django3.1
* master: (22 commits)
  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
  Changing mongodb server.
  Fixing toprc
  Attempting to collect queries for 1% of requests by using DEBUG.
  Fixing mongo install.
  Recalculating premium expiration to take into account forced expirations after gifts.
  Fixing never expire -> 1 year
  Adding 1 year expire to admin.
  ...
2021-01-05 19:12:19 -05:00
Samuel Clay
d05b84e673 Whoops 2021-01-05 14:57:46 -05:00
Samuel Clay
8c3fe964f2 Better logging for broken paypal ipns. 2021-01-05 14:55:53 -05:00
Jonathan Math
a2c7acf3ff correct newsblur to newsblur_web in tasks 2021-01-04 13:33:56 -05:00
Samuel Clay
757b778658 Changing mongodb server. 2021-01-04 13:33:07 -05:00
Samuel Clay
a5cac63a74 Attempting to collect queries for 1% of requests by using DEBUG. 2021-01-04 10:22:04 -05:00
Samuel Clay
5aadbc5413 Recalculating premium expiration to take into account forced expirations after gifts. 2021-01-03 17:48:08 -05:00
Samuel Clay
49e058d9fa Fixing never expire -> 1 year 2021-01-03 14:05:17 -05:00
Samuel Clay
83d7357306 Adding 1 year expire to admin. 2021-01-03 13:59:33 -05:00
Jonathan Math
68830f00a0 merge master 2021-01-03 12:06:25 -05:00
Jonathan Math
79f249878b remove use of ORIGINAL_PAGE_SERVER 2021-01-03 11:09:25 -05:00
Alistair Francis
5a3f354e43 apps/reader/views: Send last_read_date when retrieving read stories
When retrieving the list of read stories from the server return the
last_read_date. This is useful for clients that re-downloaded stories
when performing a sync.

Signed-off-by: Alistair Francis <alistair@alistair23.me>
2020-12-22 11:13:15 -08:00
Samuel Clay
865829c58d Merge branch 'master' into dashboard3
* master:
  Binding feeds. Hope this works.
  Adding real-time notification for shared stories. Not doing anything with this on the frontend yet, but the dashboard3 will use it for the global shared stories.
  Android v10.2.0.
  Cleanup immersive mode
  #1253 Re-sync mechanism
  Android v10.1.3.
  Premium subscription currency
  #1204 Show story changes
  #1385 and #1390 In App Browser via Custom Tabs
  #1378 Rearrange and trim main popup menu
  Revert dev version name
  #1381 AndroidX Preference. Nav bar color
  #1381 Action bars and popup menus
  #1381 Material Dark and Black Themes
  #1381 Material Light Theme
  #1381 Support Action Bar and AndroidX Alert Dialog
2020-12-17 19:56:37 -05:00
Samuel Clay
ee7d2cc891 Adding real-time notification for shared stories. Not doing anything with this on the frontend yet, but the dashboard3 will use it for the global shared stories. 2020-12-17 18:52:06 -05:00
Samuel Clay
e8e74e4ec4 Updating requests exception. 2020-12-17 12:21:04 -05:00
Samuel Clay
c790b7c5f7 Fixing v2 to v3 pickle issue by namespacing cache. 2020-12-17 11:55:06 -05:00
Samuel Clay
1cbbbcceaf Reversing social/river_stories due to change in comparison of sorted lists (the old way used a b-a comparator, which is backwards to timestamps. 2020-12-15 18:23:48 -05:00
Samuel Clay
1fecc9aca3 Fixing global shared stories on dashboard. 2020-12-14 15:08:14 -05:00
Samuel Clay
6b43f5a9e6 Saving missing dashboard rivers and correctly placing them. Now to tie data and template together, then add options. 2020-12-10 18:33:43 -05:00
Samuel Clay
8736260077 Stubbing in dashboard rivers. Also restyling static pages. 2020-12-10 12:32:20 -05:00
Samuel Clay
ccdf7e260b Stubbing in dashboard rivers model and loading. Needs attachment to JS models. 2020-12-09 18:20:55 -05:00
Samuel Clay
f39a0405cf NullBooleanField deprecated 2020-12-09 17:20:08 -05:00
Samuel Clay
c257f2c7bd Cleaning up feed title display for dashboard river to use. 2020-12-08 18:14:09 -05:00
Samuel Clay
d9e59ec8a5 Merge branch 'dashboard' into dashboard3
* dashboard:
  Folder colors
  Clean analytics task name
2020-12-08 15:49:13 -05:00
Samuel Clay
e7fb784d0e Clean analytics task name 2020-12-08 13:47:53 -05:00
Samuel Clay
06a8f88341 Adding debug3 as subdomain for testing. 2020-12-08 13:19:23 -05:00
Samuel Clay
92d8caf2b4 Merge branch 'django3.1' into docker_django3.1
* django3.1:
  Auto-enabling newsblur3 virtualenv.
  Fixing 2to3 string encoding.
  Rolling back pymongo.
  Upgrading all dependencies. This probably won't work (looking at you timezones).
  Updating feedparser.
  Django 3.1.
2020-12-08 13:06:56 -05:00
Samuel Clay
05756155b1 Merge branch 'django3.0' into docker_django3.0
* django3.0: (184 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 13:04:39 -05:00
Samuel Clay
aea4fcbe5b Merge branch 'django3.0' into django3.1
* django3.0: (27 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 09:10:51 -05:00
Samuel Clay
8371c635f7 Merge branch 'master' into django2.0
* master: (27 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 09:09:25 -05:00
Samuel Clay
df21f2b962 Moving logging over to the newsblur log. 2020-12-07 17:37:27 -05:00
Samuel Clay
fca0f68761 Fixing search indexer background task for new celery. 2020-12-07 16:36:17 -05:00
Samuel Clay
aff7d09962 Attempting to add gunicorn errors to console/log. 2020-12-07 13:55:28 -05:00
Samuel Clay
2aaf6d8b25 Better handling of missing subs. 2020-12-07 13:32:53 -05:00
Samuel Clay
cab602e3f1 Handling missing user sub on feed delete. 2020-12-07 13:13:56 -05:00
Samuel Clay
d0ca50d9d6 Login required should use the next parameter. 2020-12-07 11:42:23 -05:00
Samuel Clay
8bf74cbcef Handling newsletters with multiple recipients. 2020-12-06 18:23:31 -05:00
Samuel Clay
18db90df9a Extracting image urls sometimes fails. 2020-12-06 12:30:24 -05:00
Samuel Clay
1a5d440582 Adding timeouts to most outbound requests. 2020-12-06 11:37:01 -05:00
Samuel Clay
5085cd8323 Found four more GET/POST crosses. 2020-12-06 10:26:09 -05:00
Samuel Clay
0c516b76db Feed unread count may need a POST. 2020-12-05 17:55:29 -05:00
Samuel Clay
77465354a3 Merge branch 'django1.11'
* django1.11: (140 commits)
  Massaging roles.
  Adding stats logging
  Separating app from web role.
  Upgrading work servers.
  request.raw_post_data -> request.body (django 1.6)
  Upgrading pgbouncer to 1.15.0.
  Fixing supervisor path issues
  Upgrading setuptools
  Fixing flask
  Removing dependency, fixing encoding issue for pages.
  Fixing DB Monitor.
  Updating User Agent for all fetchers.
  Ignoring VSCode.
  Fixing Statistics by fixing how timezones are handled.
  Fixing API page.
  Fixing both Stripe form and Login form.
  Handling missing user during auth.
  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
  ...
2020-12-05 14:37:44 -05:00
Samuel Clay
871b434f6b Adding stats logging 2020-12-05 14:16:17 -05:00
Samuel Clay
47f1b59621 get_feed_by_url should do the same as get_feed_from_url. 2020-12-05 12:51:30 -05:00