Commit graph

1742 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
f88d9f7a43 Fixing various django1.9 issues, mainly around templates. 2020-06-25 17:57:35 -04:00
Samuel Clay
12b599fcad Merge branch 'django1.8' into django1.9
* django1.8: (109 commits)
  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.
  No ECMAScript 6 yet. Wait until it's the only change.
  Mark read button
  Older httplib2 doesn't have setuptools legacy issue.
  Upgrading redis session.
  Upgrading redis session.
  Django 1.6.11, not requiring fields=__all__. @sictiru, wondering if this is necessary?
  Better newsletter check
  Adding allowlist (whitelist) for RSS Bridge.
  Removing last vestigates of Google Analytics.
  New spinners.
  Cleaning up profile modal.
  Scratch that, better bright.
  Darkening light blue links and graphs.
  ...
2020-06-24 17:00:44 -04:00
Samuel Clay
540587e01e Merge branch 'django1.7' into django1.8
* django1.7: (108 commits)
  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.
  No ECMAScript 6 yet. Wait until it's the only change.
  Mark read button
  Older httplib2 doesn't have setuptools legacy issue.
  Upgrading redis session.
  Upgrading redis session.
  Django 1.6.11, not requiring fields=__all__. @sictiru, wondering if this is necessary?
  Better newsletter check
  Adding allowlist (whitelist) for RSS Bridge.
  Removing last vestigates of Google Analytics.
  New spinners.
  Cleaning up profile modal.
  Scratch that, better bright.
  Darkening light blue links and graphs.
  Better cross browser watching for changing theme.
  ...
2020-06-24 16:34:18 -04:00
Samuel Clay
d88dab454a Merge branch 'django1.6' into django1.7
* django1.6: (109 commits)
  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.
  No ECMAScript 6 yet. Wait until it's the only change.
  Mark read button
  Older httplib2 doesn't have setuptools legacy issue.
  Upgrading redis session.
  Upgrading redis session.
  Django 1.6.11, not requiring fields=__all__. @sictiru, wondering if this is necessary?
  Better newsletter check
  Adding allowlist (whitelist) for RSS Bridge.
  Removing last vestigates of Google Analytics.
  New spinners.
  Cleaning up profile modal.
  Scratch that, better bright.
  Darkening light blue links and graphs.
  Better cross browser watching for changing theme.
  ...
2020-06-24 16:04:10 -04:00
Samuel Clay
2d0c82a7b2 Merge branch 'master' into django1.6
* master: (43 commits)
  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.
  No ECMAScript 6 yet. Wait until it's the only change.
  Mark read button
  Older httplib2 doesn't have setuptools legacy issue.
  Upgrading redis session.
  New spinners.
  Cleaning up profile modal.
  Scratch that, better bright.
  Darkening light blue links and graphs.
  Better cross browser watching for changing theme.
  Feed title color
  Tuning feedback colors.
  New blurred logo (for dark mode).
  Half-way fixed homepage. Also adding Auto theme (as default, too), thanks to @dejal's suggestion.
  Adding 10 features to welcome page.
  Removing debugging
  ...
2020-06-24 15:35:07 -04:00
Samuel Clay
e1a8ffe064 Cleaning up Twitter lists. 2020-06-24 09:34:49 -04:00
Jonathan Math
af6db197d5 Merge remote-tracking branch 'origin/django1.6' into django2.0 2020-06-23 00:46:40 -04:00
Samuel Clay
cfd49f2da0 Merge branch 'master' into django1.6
* master: (63 commits)
  Better newsletter check
  Adding allowlist (whitelist) for RSS Bridge.
  Removing last vestigates of Google Analytics.
  Android v10.0.
  #1161 (android widget) RemoteViews empty state
  Android v10.0b3.
  #1298 (saved searches)
  #1298 (saved searches)
  #1304 (not restoring state)
  #1306 (status bar during fullscreen)
  #1231 (sharing crash)
  #1309 (theme in story detail view)
  Fixed #1314 (persistent "All Done")
  #1306 (status bar during fullscreen)
  #1294 (move to new folder)
  #1293 (invalid permalink)
  #1306 (status bar during fullscreen)
  #1306 (status bar during fullscreen)
  #1294 (move to new folder)
  #1301 (white flash in dark mode)
  ...
2020-06-22 10:49:00 -04:00
Jonathan Math
d8e37704c9 fix unnecessary encoding issue 2020-06-20 01:11:59 -04:00
Jonathan Math
bd3423fe9c explicitly encode strings before hashing 2020-06-20 00:27:01 -04:00
Jonathan Math
d37f2286b1 fix syntax errors and import issue for compat 2020-06-19 02:35:30 -04:00
Jonathan Math
2e8deade58 2to3 the rest of utils/ 2020-06-19 02:29:40 -04:00
Jonathan Math
3a0a2c28b8 2to3 utils/*.py 2020-06-19 02:27:48 -04:00
Jonathan Math
43dbdbf81e remove vendor/yaml/ and import from pyyaml 2020-06-17 03:26:48 -04:00
Jonathan Math
044370e2f4 use updated middleware syntax 2020-06-17 03:24:16 -04:00
Jonathan Math
add3dcbe6c remove .bak files in utils 2020-06-15 23:41:18 -04:00
Samuel Clay
1c01990c42 Renaming feedfinder and feedfinder2. 2020-06-15 12:30:30 -04:00
jmath1
66e8990981 convert some utils/ files to python3 2020-06-15 05:24:48 -04:00
jmath1
2d62e80344 change smart_unicode to smart_text in utils/feedfunctions.py 2020-06-13 13:16:50 -04:00
jmath1
66b2011707 2to3 NewsBlur/utils/ 2020-06-13 13:13:20 -04:00
jmath1
5c1e0a1c5e change force_str to force_text and smart_unicode to smart_bytes in utils/json_functions.py 2020-06-13 13:06:59 -04:00
jmath1
09fd8fa846 2to3 utils/json_functions.py 2020-06-13 13:04:33 -04:00
jmath1
d1ab75ec2f move location where setup_databases is imported in testrunner.py because the old location is deprecated 2020-06-13 00:33:30 -04:00
jmath1
a61e1a7b99 Remove use of RequestContext and change render_to_response to render 2020-06-12 01:27:07 -04:00
jmath1
7d95dbb5cf change User.is_authenticated() and User.is_anonymous() to attributes 2020-06-11 15:13:12 -04:00
jmath1
5c6a48ed52 switch generate_secret_token from sha1 to sha256 algorithm 2020-06-11 11:08:45 -04:00
jmath1
26f3a22afb change SingleRelatedObjectDescriptor to ReverseOneToOneDescriptor 2020-06-11 03:51:40 -04:00
Samuel Clay
6994b02e57 Bumping newsletter bounce to 50%. 2020-06-08 15:12:23 -04:00
Samuel Clay
e42f3011af Updating emails on monitors. 2020-06-08 15:11:42 -04:00
Samuel Clay
7f38f64447 Removing unused south calls. 2020-06-08 11:07:05 -04:00
jmath1
bcfc17a9db use DiscoverRunner to run tests 2020-06-08 07:56:11 -04:00
jmath1
3f8b0655d4 change mimetype to content_type and stop using request.REQUEST 2020-06-07 08:04:23 -04:00