Commit graph

760 commits

Author SHA1 Message Date
Samuel Clay
5a3884c3bd Merge branch 'django1.7' into django1.8
* 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.
  ...
2020-08-10 17:51:25 -04:00
Samuel Clay
7ee517444e Merge branch 'django1.6' into django1.7
* django1.6: (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.
  ...
2020-08-10 17:49:20 -04:00
Samuel Clay
19aa312276 Merge branch 'master' into django1.6
* master:
  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.
  #1282 Adding feed to root folder
  #1319 In app and external browser options
  #1335 Auto theme option for OS level dark mode
  #1347 Show pager with stories after using the intel trainer and refreshing
  #1272 Load HTML in comments
2020-08-10 17:34:43 -04:00
Samuel Clay
acaf222999 Merge branch 'highlights' into django1.6
* highlights: (93 commits)
  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.
  #1348 (scroll indicators theme)
  #1344 (search loses focus)
  Fixing signup flow.
  New icon for Infrequent Site Stories.
  Allowing selection in private notes.
  Autoresizing private notes field.
  For #1035: Adding private notes to saved stories.
  Adding REDIS_SESSIONS to local-settings template.
  Adding user notes. Unverified and needs saved confirmation.
  Fixing typo on highlights check in starred stories.
  Ignoring right-click when highlighting.
  Adding preference to turn off highlighter.
  Trim highlights for consistency and to fix a bug where paragraph ends look different.
  The story margins now allow for highlighting.
  Adding in model for upcoming highlights (so non-highlights branches dont crash on new data
  Renaming highlights to is_highlights for starred story counts.
  ...
2020-08-10 17:34:06 -04:00
Samuel Clay
ca675b0b5a Fixing unit test for profile app and signup. 2020-08-04 13:10:51 -04:00
Samuel Clay
5dc61fa8c4 Adding nginx.local.conf 2020-07-28 12:06:48 -04:00
Samuel Clay
325a6d26e1 Fixing signup flow. 2020-07-21 17:04:01 -04:00
Samuel Clay
9be9042e44 Django 3.0. Doesn't work due to timezone lib. 2020-07-07 16:26:49 -04:00
Samuel Clay
8d03d7da0a Django 2.2. 2020-07-07 16:06:48 -04:00
Samuel Clay
bb9ed80ba9 Merge branch 'django1.10' into django1.11
* django1.10:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
2020-07-07 15:56:21 -04:00
Samuel Clay
158c02abd4 Merge branch 'django1.9' into django1.10
* django1.9:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
2020-07-07 15:56:15 -04:00
Samuel Clay
4f912a3eb2 Merge branch 'django1.8' into django1.9
* django1.8:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
2020-07-07 15:56:08 -04:00
Samuel Clay
b9bf48fa14 Merge branch 'django1.7' into django1.8
* django1.7:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
2020-07-07 15:56:04 -04:00
Samuel Clay
dae31f712b Merge branch 'django1.6' into django1.7
* django1.6:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
2020-07-07 15:55:58 -04:00
Samuel Clay
313fe0a258 Merge branch 'master' into django1.6
* master:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
2020-07-07 15:55:49 -04:00
Samuel Clay
b4ed7d6ffb Django 2.1.15 2020-07-07 15:55:40 -04:00
Jonathan Math
f93c893a1b update requirements.txt 2020-07-04 00:27:35 -04:00
Samuel Clay
14b79d466b De-vendorizing typogrify. 2020-07-01 23:35:06 -04:00
Samuel Clay
7611d5a75c Correcting gunicorn 2020-07-01 22:16:11 -04:00
Samuel Clay
154e5b864a Upgrading httplib2. 2020-06-30 17:26:36 -04:00
Samuel Clay
a1447df283 Upgrading httplib2. 2020-06-30 17:25:44 -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
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
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
8bf623effd Upgrading redis cache. 2020-06-26 18:41:10 -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
62e7c2bb06 Django 1.9.13. 2020-06-24 17:01:56 -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
cdda78d916 De-vendorizing django-paypal, adding to requirements.txt. 2020-06-24 16:59:43 -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
745bab15af Older httplib2 doesn't have setuptools legacy issue. 2020-06-23 12:02:19 -04:00
Jonathan Math
814adfe829 remove seacucumber from requirements because it is vendorized and the current version is not supported in python3 2020-06-23 06:17:53 -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
891551a592 Upgrading redis session. 2020-06-22 12:25:09 -04:00
Samuel Clay
f056eac6ff Upgrading redis session. 2020-06-22 12:23:40 -04:00
Samuel Clay
c14d6e5bbc Django 1.6.11, not requiring fields=__all__. @sictiru, wondering if this is necessary? 2020-06-22 11:52:07 -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
Samuel Clay
8c305ad1c8 Adding allowlist (whitelist) for RSS Bridge. 2020-06-22 08:51:02 -04:00
Samuel Clay
7436f6953b Djanog 1.11.29 2020-06-20 09:46:03 -04:00
Jonathan Math
da74451e59 update requirements.txt 2020-06-20 02:14:44 -04:00
Jonathan Math
a1df400c96 update requirements.txt file 2020-06-20 00:08:38 -04:00
Jonathan Math
969d0a9276 update requirements.txt subdomains, mongoengine, and tweepy versions 2020-06-17 03:53:02 -04:00
Jonathan Math
df547d1ee6 update requirements.txt 2020-06-16 01:03:06 -04:00
Jonathan Math
1414d3d3e6 add sgmllib3k to requirements.txt 2020-06-15 23:37:03 -04:00