Commit graph

2909 commits

Author SHA1 Message Date
Samuel Clay
ccdf7e260b Stubbing in dashboard rivers model and loading. Needs attachment to JS models. 2020-12-09 18:20:55 -05:00
Samuel Clay
b4f14c0b49 Newsletter default icon. 2020-12-09 09:31:32 -05:00
Samuel Clay
8387c921b6 Merge branch 'dashboard' into dashboard3
* dashboard:
  Handling empty feed (specifically for the case of a deleted shared/social feed with a saved search on the deleted feed.
2020-12-08 18:43:04 -05:00
Samuel Clay
33571abe79 Merge branch 'master' into dashboard
* master:
  Handling empty feed (specifically for the case of a deleted shared/social feed with a saved search on the deleted feed.
2020-12-08 18:40:40 -05:00
Samuel Clay
fbe42ce1ef Handling empty feed (specifically for the case of a deleted shared/social feed with a saved search on the deleted feed. 2020-12-08 18:40:32 -05:00
Samuel Clay
b75948ed60 Pubsub on multiple rivers. 2020-12-08 18:39:58 -05:00
Samuel Clay
c257f2c7bd Cleaning up feed title display for dashboard river to use. 2020-12-08 18:14:09 -05:00
Samuel Clay
0e427cbea8 Removing imperfect proxy warning for every story. 2020-12-06 10:31:20 -05:00
Samuel Clay
46f96bbe6e Removing imperfect proxy warning for every story. 2020-12-06 10:30:21 -05:00
Samuel Clay
b64b37f105 Merge branch 'django1.11' into dashboard
* django1.11: (220 commits)
  Fixing Statistics by fixing how timezones are handled.
  Checking the 'credit' field if author not found. Works for TechRepublic, which I suspect is a one off.
  Handling multiple newsletter feeds.
  Attempting a fix of stories taking too long to sort while counting unreads.
  Fixing newsletter search.
  Fixing newsletter search.
  Newsletters feeds now de-duplicate based on sender email as well as sender name. This should cut down on duplicates.
  Android v10.1.1.
  Fixing API page.
  Ignoring cache for homepage user.
  Fixing both Stripe form and Login form.
  Handling missing user during auth.
  Gotta recreate empty_values somehow
  Going back on AllowAllUsers backend, as it doesn't work with django 1.5 authentication sessions.
  Going back and forth on this but without AllowAllUsersModelBackend, then is_active=False won't allow authentication.
  De-vendorizing django-paypal
  Vendorizing paypal
  Re-vendorizing django-paypal until django 1.11 upgrade is complete.
  Wrong fix for missing tagline. SHould instead create a FeedData.
  Fixing missing tagline error.
  ...
2020-11-24 18:28:03 -05:00
Samuel Clay
ce52802ebd Fixing Statistics by fixing how timezones are handled. 2020-11-23 18:58:00 -05:00
Samuel Clay
58d763629f RIP Shiloh (2000 - 2018). Welcome Lyric (Born May 2020). 2020-11-12 20:28:03 -05:00
Samuel Clay
0f87f7b2b6 Merge branch 'django1.10' into django1.11
* django1.10:
  Adding feed unread count refresh when changing intelligence level.
  Task fetches error.
2020-11-12 18:41:17 -05:00
Samuel Clay
de170a4f29 Merge branch 'django1.7' into django1.8
* django1.7:
  Adding feed unread count refresh when changing intelligence level.
  Task fetches error.
2020-11-12 18:41:01 -05:00
Samuel Clay
edc2d3c938 Adding feed unread count refresh when changing intelligence level. 2020-11-12 18:37:30 -05:00
Samuel Clay
48ebe5ce84 Feed unread count should be a GET request, not a POST. 2020-11-09 13:18:35 -05:00
Samuel Clay
0981286f56 Merge branch 'django1.7' into django1.8
* django1.7: (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:13 -05:00
Samuel Clay
16b50b5110 Adding style option for grid height. XS/S/M/L/XL 2020-10-28 11:51:42 -04:00
Samuel Clay
0f361a6558 Fixing subscription cancelation error messge. 2020-10-19 15:07:14 -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
d2251a7bd3 Merge branch 'master' into dashboard
* master:
  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.
2020-08-03 10:40:39 -04:00
Samuel Clay
1f86cb7429 Adding a smarter wakeup for real-time to handle cases where a laptop is re-opened but real-time is not immediately reestablished. 2020-07-27 09:41:37 -04:00
Samuel Clay
fcae5f6297 Merge branch 'master' into dashboard
* master:
  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.
2020-07-16 19:08:47 -04:00
Samuel Clay
5f569ade71 Autoresizing private notes field. 2020-07-16 16:10:38 -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
2c47bae8a9 Attempting to add story opening for dashboard, but broke saved searches. 2020-07-15 11:51:03 -04:00
Samuel Clay
0ae1b465c1 Merge branch 'master' into dashboard
* master:
  Fixing typo on highlights check in starred stories.
  Ignoring right-click when highlighting.
2020-07-14 18:42:11 -04:00
Samuel Clay
239722068e Ignoring right-click when highlighting. 2020-07-14 18:34:39 -04:00
Samuel Clay
74fdefb53e Turning off queueing for dashboard stories. 2020-07-14 18:01:33 -04:00
Samuel Clay
114641f05d Merge branch 'master' into dashboard
* master:
  Adding preference to turn off highlighter.
2020-07-14 17:45:10 -04:00
Samuel Clay
009a59006e Adding preference to turn off highlighter. 2020-07-14 17:30:35 -04:00
Samuel Clay
951dd54d81 Individual dashboard rivers. Need support for opening stories and limits. 2020-07-14 16:41:07 -04:00
Samuel Clay
0e894954e6 Trim highlights for consistency and to fix a bug where paragraph ends look different. 2020-07-13 17:33:42 -04:00
Samuel Clay
d94d533631 The story margins now allow for highlighting. 2020-07-13 17:26:02 -04:00
Samuel Clay
735227a097 Renaming highlights to is_highlights for starred story counts. 2020-07-13 13:05:13 -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
6de5c30a42 Filtering out highlights from other nodes, at least minimizing the one remaining highlight bug. 2020-07-09 17:55:35 -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
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
d66537bd0f Refactoring welcome screen to fix input alignment issue. 2020-07-06 19:57:30 -04:00
Samuel Clay
f7d3c5d3e6 Fixing login rotation. 2020-07-06 18:14:09 -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
5272a11ab0 Not every story is from a feed. 2020-06-25 16:31:18 -04:00
Samuel Clay
3c334d56ff Using the correct attribute. 2020-06-25 15:22:29 -04:00
Samuel Clay
12ab2342d5 Typo in template 2020-06-25 15:20:25 -04:00
Samuel Clay
2e878eee1d Attempting to style newsletters in dark mode. 2020-06-25 15:18:47 -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
8a51faf191 Fixing broken auto-dark theme. 2020-06-24 15:28:22 -04:00