Commit graph

1177 commits

Author SHA1 Message Date
Samuel Clay
a09250523b Merge branch 'django1.8' into django1.9
* django1.8: (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:38:21 -05:00
Samuel Clay
7c447c0fbc Merge branch 'django1.6' into django1.7
* django1.6: (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:38:01 -05:00
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
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
89e51a2937 change celery Task import and task initialization as per the new version of celery 2020-10-05 00:45:20 +07: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
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
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
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
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
25a5568f30 Fixing typo on highlights check in starred stories. 2020-07-14 18:39:42 -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
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
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
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
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
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
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
3bae1582df Loading dark theme if selected on load. 2020-06-25 14:57:31 -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
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
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
Samuel Clay
2f505de82d Removing debugging 2020-06-17 18:17:29 -04:00
Samuel Clay
3adb60944d Updating logo for dark mode. 2020-06-17 18:17:05 -04:00
Jonathan Math
cedf8eb67a create a function to get subdomain for apps/reader/views.py and 2to3 tests.py and views.py for apps/reader/ 2020-06-17 00:41:50 -04:00
Samuel Clay
68e99c6541 Merge branch 'master' into darkmode
* master:
  Including feeds in flat feeds even when asking for inactive feeds.
2020-06-15 20:06:35 -04:00
Samuel Clay
31451b1093 Including feeds in flat feeds even when asking for inactive feeds. 2020-06-15 20:05:25 -04:00
jmath1
84fa6f2843 2to3 apps/reader/ 2020-06-15 05:24:54 -04:00
jmath1
7d95dbb5cf change User.is_authenticated() and User.is_anonymous() to attributes 2020-06-11 15:13:12 -04:00
jmath1
08f0ffd12e Fix other instances of request.REQUEST 2020-06-11 02:43:05 -04:00
Samuel Clay
26dfca92d8 Rewrote story header to position sticky. Much better. Grid needs numbering to handle new grid layout. 2020-06-10 20:56:34 -04:00
Samuel Clay
953b9712c2 Removing Google Reader traces. 2020-06-10 19:24:02 -04:00
Samuel Clay
3a1a94cc60 This actually fixes #1098 by keeping the add url even through login. 2020-06-08 20:40:45 -04:00
jmath1
abdf1b67e5 change mimetype to content_type 2020-06-08 05:35:27 -04:00
jmath1
3f8b0655d4 change mimetype to content_type and stop using request.REQUEST 2020-06-07 08:04:23 -04:00
jmath1
4e89bcd67a upgrade to django 1.6 and make migrations 2020-06-05 11:00:54 -04:00
Samuel Clay
3d25d1a2d2 Merge branch 'master' into highlights
* master: (54 commits)
  Removing unused merge_feeds command, this is better used in rss_feeds/models.py
  Temporarily turn off https only.
  Changing color on dark mode cutoff.
  Adding dark mode cutoff for blurlogs.
  Redirect http to https. Long time coming.
  Testing http > https redirect.
  Handling broken page importer.
  Handling multiple starred stories.
  Handling NoAnswer on broken emails.
  Overriding story url.
  Removing Daily Skip from text importer.
  Adding YouTube ToS to ToS.
  Adding saved searches to flat feeds for #1298.
  6 hour min
  6 hour minimum for craigslist
  #1292 (dark mode FTUX)
  Xcode 11.4 tweaks
  #1290 (state restoration)
  Fixing premium upgrade form
  ios v10.0.2.
  ...
2020-05-22 10:26:50 -04:00
Samuel Clay
3d0c060dfe Handling multiple starred stories. 2020-05-04 09:48:45 -04:00