Commit graph

4481 commits

Author SHA1 Message Date
Samuel Clay
d1b5c161b1 Merge branch 'master' into django1.6
* master: (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.
  ...
2020-11-09 11:37:52 -05:00
Jonathan Math
3c354b58db rename test files and testcase classes so they can be found by pytest 2020-11-07 11:47:14 +07:00
Jonathan Math
7084f68bff fix unique error caused by slashdot1.json 2020-11-07 10:47:57 +07:00
Jonathan Math
83048ce0ca python3/django3 upgrades 2020-11-07 10:46:41 +07:00
Jonathan Math
535628e7de fix up tests/fixtures for reader and make compatible with pytest 2020-11-06 14:51:36 +07:00
Jonathan Math
6bd4ecb569 change smart_text to smart_str to get rid of deprecation warning 2020-11-06 14:46:40 +07:00
Jonathan Math
e49de4c4c5 remove "types" index specification from profile models 2020-11-06 14:44:26 +07:00
Jonathan Math
03163a06b4 remove types index specification because it is not compatible with later versions of mongodb 2020-11-06 14:42:58 +07:00
Jonathan Math
5877fd979e missed some mimetype edits in django upgrade 2020-10-24 19:25:26 +07:00
Samuel Clay
78c290e98d Saving saved story slugs. 2020-10-22 20:14:11 -04:00
Samuel Clay
b01aa852f7 Slugifying saved story tags that have no slugs. 2020-10-22 20:12:56 -04:00
Jonathan Math
1fbec54aa8 python2 to python3 conversion for analyzer and push 2020-10-13 22:01:32 +07:00
Jonathan Math
9b0f3993fb rm notes document... that should not be there 2020-10-13 10:26:26 +07:00
Jonathan Math
991cc3855d bug fixes from missed django/python upgrade 2020-10-12 12:30:40 +07:00
Samuel Clay
6c59416ca8 Showing addresses in email story share. 2020-10-06 11:04:30 -04:00
Jonathan Math
ad0ecdb8cc add migration for timezone change 2020-10-05 16:35:26 +07:00
Jonathan Math
89e51a2937 change celery Task import and task initialization as per the new version of celery 2020-10-05 00:45:20 +07:00
Jason Ghent
fe9c8fd3c5
Respect ENFORCE_SIGNUP_CAPTCHA in profile signup 2020-08-31 22:30:57 -04:00
Samuel Clay
d2045b7d06 Adding Android premium activation and receipt saving. For #1343. 2020-08-25 21:08:27 -04:00
Samuel Clay
185ea01823 /reader/starred_story_hashes?include_timestamp=1 now uses the modified date of the starred story in case highlighting changes. Thanks to Renaud Preat of Actu. 2020-08-21 11:48:57 -04:00
Samuel Clay
c508c58224 Merge branch 'django1.11' into django2.0
* django1.11: (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:53:48 -04:00
Samuel Clay
ac1471017d Merge branch 'django1.10' into django1.11
* django1.10: (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:52:24 -04:00
Samuel Clay
cb891e0001 Merge branch 'django1.9' into django1.10
* django1.9: (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:52:12 -04:00
Samuel Clay
4e90e86e04 Merge branch 'django1.8' into django1.9
* django1.8: (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:46 -04:00
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
dec27e7adc Beginning fix of rss_feeds unit tests. 2020-08-04 13:45:16 -04:00
Samuel Clay
ca675b0b5a Fixing unit test for profile app and signup. 2020-08-04 13:10:51 -04:00
Samuel Clay
a29f1235a4 Remove highlights count when it reaches zero. 2020-08-04 08:56:07 -04:00
Samuel Clay
6bb652965e Stubbing in profile tests. 2020-07-28 13:01:43 -04:00
Samuel Clay
325a6d26e1 Fixing signup flow. 2020-07-21 17:04:01 -04:00
Samuel Clay
aab7f1f49e For #1035: Adding private notes to saved stories. 2020-07-16 15:49:28 -04:00
Samuel Clay
537e4ed1c9 Adding user notes. Unverified and needs saved confirmation. 2020-07-15 21:25:00 -04:00
Samuel Clay
25a5568f30 Fixing typo on highlights check in starred stories. 2020-07-14 18:39:42 -04:00
Samuel Clay
d22e8f087c Merge branch 'master' into highlights
* master:
  Adding in model for upcoming highlights (so non-highlights branches dont crash on new data
  No future dating mark read dates due to stories being future dated.
2020-07-13 14:38:34 -04:00
Samuel Clay
85e70ba81e Adding in model for upcoming highlights (so non-highlights branches dont crash on new data 2020-07-13 14:37:42 -04:00
Samuel Clay
735227a097 Renaming highlights to is_highlights for starred story counts. 2020-07-13 13:05:13 -04:00
Samuel Clay
570eeacbdb Fixing highlights RSS. 2020-07-10 18:59:35 -04:00
Samuel Clay
c83a6ebe80 Fixing highlights counts. 2020-07-10 18:58:01 -04:00
Samuel Clay
30b047bbb4 New highlights saved story feed. Adding API docs, url handling, and counts. Counts need work, as does active selection of new highlights feed. 2020-07-10 17:59:11 -04:00
Samuel Clay
5c18498d99 No future dating mark read dates due to stories being future dated. 2020-07-09 17:56:13 -04:00
Samuel Clay
10288ccff0 Got highlighting works end-to-end! This is nearly ready to launch, just need to re-select selected text. 2020-07-08 19:00:09 -04:00
Samuel Clay
058154c913 Merge branch 'master' into highlights
* master: (161 commits)
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
  Removing dupe db log.
  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.
  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-07-07 16:28:13 -04:00
Jonathan Math
be9f31e519 fix issue with static files in local development by making STATIC_URL = '/static/' and STATIC_ROOT = '/static/static_root/' if DEBUG == True in settings.py 2020-07-03 03:00:41 -04:00
Jonathan Math
524045fdf6 add backend argument to login_user functions because there are two backends 2020-07-03 02:20:42 -04:00
Jonathan Math
d3c63d2a6b fix issues for create new user flow caused by django upgrade 2020-07-03 02:12:59 -04:00
Jonathan Math
3c06baa684 Update management commands to assist with development 2020-07-03 02:11:02 -04:00
Samuel Clay
75b320749d Adding console exception logging. 2020-07-02 18:31:13 -04:00