Commit graph

13234 commits

Author SHA1 Message Date
Samuel Clay
1351aee6a8 Vendorizing new feedparser. 2020-07-01 18:38:37 -04:00
Samuel Clay
6f14455115 Proper base64 encode/decode 2020-07-01 16:59:21 -04:00
Samuel Clay
a8b69dd2b8 Moving local_settings into newsblur subdir. 2020-07-01 11:58:41 -04:00
Samuel Clay
bc7055b971 StringIO -> BytesIO 2020-07-01 11:57:51 -04:00
Jonathan Math
7279171e4c update dockerfile and readme to use wsgi/settings files that have been moved 2020-07-01 02:32:35 -04:00
Jonathan Math
1f8ecb11d1 fix settings.py 2020-07-01 00:19:36 -04:00
Jonathan Math
a778e1ba47 fix merge conflicts and pull in changes to fix Django2.0 branch 2020-07-01 00:02:51 -04:00
Samuel Clay
eeb44e3400 Fixing a bunch of feed fetch py3 errors. Fetching now works! 2020-06-30 20:50:30 -04:00
Samuel Clay
1fc063ff80 Fixing middleware for new format. 2020-06-30 19:46:32 -04:00
Samuel Clay
a1447df283 Upgrading httplib2. 2020-06-30 17:25:44 -04:00
Samuel Clay
42d4a4211f Fixing encoding issues. 2020-06-30 17:22:47 -04:00
Samuel Clay
b05dcb3664 Fixing encoding errors 2020-06-30 15:29:28 -04:00
Samuel Clay
9155216e46 So many bytes<>str encoding issues. Also mongoengine wants to create new indexes all the time. 2020-06-30 14:49:12 -04:00
Samuel Clay
0d6cb69548 Merge branch 'django1.11' into django2.0
* django1.11: (73 commits)
  Switching to new celery 4 standalone binary.
  Fixing various mongo data calls.
  Upgrading to latest celery 4 (holy moly), which required some big changes to project layout. Still needs supervisor scripts updated.
  Removing unused log on cookies.
  I believe this Context wrapping is still preserved. See this django ticket: https://code.djangoproject.com/ticket/28125. Reverting this fixes the error, so I'm assuming this is that type of render.
  Have to revert 3f122d5e03 because this broke existing sessions (logged me out) because the model has changed and the serialized model stored in redis no longer matches. Whew, this took a while to figure out.
  Upgrading redis cache.
  Adding cookies to path inspector.
  Removing dupe db log.
  Fixing missing DB logs (redis and mongo) due to this change in django 1.8: "connections.queries is now a read-only attribute."
  Removing migrations that set a default date of 2020-05-08. Not sure why this was committed. I thought we resolved the issue with default datetimes?
  Fixing CallableBool.
  Missing import
  Fixing runtime errors on django 1.10
  Fixing OAuth connect.
  Fixing various django1.9 issues, mainly around templates.
  BASE_DIR
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  ...
2020-06-30 12:34:59 -04:00
Samuel Clay
230ebf5236 Switching to new celery 4 standalone binary. 2020-06-29 20:17:11 -04:00
Samuel Clay
db665fa4a3 Fixing various mongo data calls. 2020-06-29 20:17:00 -04:00
Samuel Clay
3fa55aff17 Upgrading to latest celery 4 (holy moly), which required some big changes to project layout. Still needs supervisor scripts updated. 2020-06-29 17:39:55 -04:00
Samuel Clay
d60c917a9c Removing unused log on cookies. 2020-06-28 16:36:13 -04:00
Samuel Clay
553483ce52 I believe this Context wrapping is still preserved. See this django ticket: https://code.djangoproject.com/ticket/28125. Reverting this fixes the error, so I'm assuming this is that type of render. 2020-06-28 14:52:09 -04:00
Samuel Clay
36b0823786 Merge branch 'django1.10' into django1.11
* django1.10: (131 commits)
  Have to revert 3f122d5e03 because this broke existing sessions (logged me out) because the model has changed and the serialized model stored in redis no longer matches. Whew, this took a while to figure out.
  Upgrading redis cache.
  Adding cookies to path inspector.
  Removing dupe db log.
  Fixing missing DB logs (redis and mongo) due to this change in django 1.8: "connections.queries is now a read-only attribute."
  Removing migrations that set a default date of 2020-05-08. Not sure why this was committed. I thought we resolved the issue with default datetimes?
  Fixing CallableBool.
  Missing import
  Fixing runtime errors on django 1.10
  Fixing OAuth connect.
  Fixing various django1.9 issues, mainly around templates.
  BASE_DIR
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  Using the correct attribute.
  Typo in template
  Attempting to style newsletters in dark mode.
  Loading dark theme if selected on load.
  Adding scrollbar colors.
  ...
2020-06-28 14:00:09 -04:00
Samuel Clay
9fba549ac3 Have to revert 3f122d5e03 because this broke existing sessions (logged me out) because the model has changed and the serialized model stored in redis no longer matches. Whew, this took a while to figure out. 2020-06-26 19:38:16 -04:00
Samuel Clay
6a893995bd Merge branch 'django1.9' into django1.10
* django1.9:
  Upgrading redis cache.
  Adding cookies to path inspector.
2020-06-26 18:43:00 -04:00
Samuel Clay
8bf623effd Upgrading redis cache. 2020-06-26 18:41:10 -04:00
Samuel Clay
f3e2f97fc8 Merge branch 'master' into django1.9
* master:
  Adding cookies to path inspector.
2020-06-26 16:40:50 -04:00
Samuel Clay
2af871acf6 Adding cookies to path inspector. 2020-06-26 16:40:45 -04:00
Samuel Clay
56b17fe72f Merge branch 'django1.9' into django1.10
* django1.9:
  Removing dupe db log.
  Fixing missing DB logs (redis and mongo) due to this change in django 1.8: "connections.queries is now a read-only attribute."
  Removing migrations that set a default date of 2020-05-08. Not sure why this was committed. I thought we resolved the issue with default datetimes?
2020-06-26 16:27:50 -04:00
Samuel Clay
b36df82ba0 Merge branch 'django1.8' into django1.9
* django1.8:
2020-06-26 16:27:45 -04:00
Samuel Clay
077b6de494 Merge branch 'django1.7' into django1.8
* django1.7:
2020-06-26 16:27:38 -04:00
Samuel Clay
c00cca08dd Merge branch 'django1.6' into django1.7
* django1.6:
2020-06-26 16:27:30 -04:00
Samuel Clay
ecadf77a22 Merge branch 'django1.8' into django1.9
* django1.8:
  Fixing missing DB logs (redis and mongo) due to this change in django 1.8: "connections.queries is now a read-only attribute."
  Removing migrations that set a default date of 2020-05-08. Not sure why this was committed. I thought we resolved the issue with default datetimes?
2020-06-26 16:27:24 -04:00
Samuel Clay
8a559e5055 Merge branch 'master' into django1.9
* master:
  Removing dupe db log.
2020-06-26 16:27:20 -04:00
Samuel Clay
2956cb5861 Merge branch 'master' into django1.8
* master:
  Removing dupe db log.
2020-06-26 16:27:16 -04:00
Samuel Clay
eb9db609ad Merge branch 'master' into django1.7
* master:
  Removing dupe db log.
2020-06-26 16:27:12 -04:00
Samuel Clay
7e329c6586 Merge branch 'master' into django1.6
* master:
  Removing dupe db log.
2020-06-26 16:27:08 -04:00
Samuel Clay
d0f15ab141 Removing dupe db log. 2020-06-26 16:26:59 -04:00
Samuel Clay
c475fd2edc Fixing missing DB logs (redis and mongo) due to this change in django 1.8: "connections.queries is now a read-only attribute." 2020-06-26 15:56:06 -04:00
Samuel Clay
7a99b9ffd4 Merge branch 'django1.7' into django1.8
* django1.7:
  Removing migrations that set a default date of 2020-05-08. Not sure why this was committed. I thought we resolved the issue with default datetimes?
2020-06-26 14:49:01 -04:00
Samuel Clay
8aac380af5 Removing migrations that set a default date of 2020-05-08. Not sure why this was committed. I thought we resolved the issue with default datetimes? 2020-06-26 14:48:41 -04:00
Samuel Clay
11c30d12ce Fixing CallableBool. 2020-06-26 10:15:45 -04:00
Samuel Clay
60d73a386f Missing import 2020-06-26 08:51:14 -04:00
Samuel Clay
8fe1f414d1 Fixing runtime errors on django 1.10 2020-06-26 08:49:08 -04:00
Samuel Clay
1dbfd87404 Merge branch 'django1.9' into django1.10
* django1.9: (122 commits)
  Fixing OAuth connect.
  Fixing various django1.9 issues, mainly around templates.
  BASE_DIR
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  Using the correct attribute.
  Typo in template
  Attempting to style newsletters in dark mode.
  Loading dark theme if selected on load.
  Adding scrollbar colors.
  Using request body for ios subscription.
  Django 1.9.13.
  De-vendorizing django-paypal, adding to requirements.txt.
  Specifying SESSION_SERIALIZER, which changes from PickleSerializer to JsonSerializer in django 1.5 to 1.6.
  Fixing broken auto-dark theme.
  Increasing contrast for unread counts.
  Fixing tag colors and story traversal button borders. For https://forum.newsblur.com/t/dark-mode-minor-tweak-suggestion/8225
  Cleaning up Twitter lists.
  Updating next/previous buttons and search icon.
  ...
2020-06-26 08:45:40 -04:00
Samuel Clay
6b69cc0ebe Fixing OAuth connect. 2020-06-26 08:44:13 -04:00
Samuel Clay
f88d9f7a43 Fixing various django1.9 issues, mainly around templates. 2020-06-25 17:57:35 -04:00
Samuel Clay
091500dc1d BASE_DIR 2020-06-25 17:49:01 -04:00
Samuel Clay
0d57e46f61 Merge branch 'django1.8' into django1.9
* django1.8:
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  Using the correct attribute.
  Typo in template
  Attempting to style newsletters in dark mode.
  Loading dark theme if selected on load.
  Adding scrollbar colors.
  Using request body for ios subscription.
2020-06-25 17:46:46 -04:00
Samuel Clay
fcbbd4ac25 Merge branch 'django1.7' into django1.8
* django1.7:
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  Using the correct attribute.
  Typo in template
  Attempting to style newsletters in dark mode.
  Loading dark theme if selected on load.
  Adding scrollbar colors.
  Using request body for ios subscription.
2020-06-25 17:46:40 -04:00
Samuel Clay
c5ea5f8877 Merge branch 'django1.6' into django1.7
* django1.6:
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  Using the correct attribute.
  Typo in template
  Attempting to style newsletters in dark mode.
  Loading dark theme if selected on load.
  Adding scrollbar colors.
  Using request body for ios subscription.
2020-06-25 17:46:35 -04:00
Samuel Clay
bf472d1d27 Merge branch 'master' into django1.6
* master:
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  Using the correct attribute.
  Typo in template
  Attempting to style newsletters in dark mode.
  Loading dark theme if selected on load.
  Adding scrollbar colors.
  Using request body for ios subscription.
2020-06-25 17:46:27 -04:00
Samuel Clay
5272a11ab0 Not every story is from a feed. 2020-06-25 16:31:18 -04:00