Commit graph

347 commits

Author SHA1 Message Date
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
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
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
25a5568f30 Fixing typo on highlights check in starred stories. 2020-07-14 18:39:42 -04:00
Samuel Clay
75b320749d Adding console exception logging. 2020-07-02 18:31:13 -04:00
Samuel Clay
712e30f85e Social stories weren't working between of a comparison between int and str. 2020-07-02 18:27:47 -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
db665fa4a3 Fixing various mongo data calls. 2020-06-29 20:17:00 -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
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
Jonathan Math
6303a77418 replace request.subdomain functionality in apps/social/views.py 2020-06-17 05:34:34 -04:00
Jonathan Math
f36e1f353c 2to3 apps/social/ 2020-06-17 03:47:15 -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
Samuel Clay
d90a9aa718 Goodbye AppDotNet 2020-06-11 14:06:08 -04:00
jmath1
3f8b0655d4 change mimetype to content_type and stop using request.REQUEST 2020-06-07 08:04:23 -04:00
Samuel Clay
57b6671a7b Adding secure image urls for shared stories. 2019-01-20 14:12:28 -05:00
Samuel Clay
d94c6df4ce Creating MSocialServices when necessary. 2018-08-10 15:21:02 -04:00
Samuel Clay
f1ebda09e5 Handling missing shared story when replying. Somehow the user's client is repeatedly sending a broken/500 request. 2018-06-29 14:01:48 -04:00
Samuel Clay
a21a3fa2d9 Attempting to allow both old form and new form lists in parameters. looks[]=like&looks[]=this instead of looks=like&looks=this 2017-04-04 17:13:43 -07:00
Samuel Clay
272db0acaa Upping quota to 100 shared stories a day. 2017-03-23 08:53:49 -07:00
Samuel Clay
5e3a3f1e6f Bumping premium shares to 50 per day. 2017-03-21 16:21:45 -07:00
Samuel Clay
259ee02663 Only 20 stories may be shared per day for premiums, 3 for free users. Also hits IFTTT sharing. 2017-03-21 12:54:27 -07:00
Samuel Clay
b548e9c7ff Correctly counting shared stories by using social sub's mark as read date. Matches individual blurblogs unread counts and unread stories with All Shared Stories. 2017-01-10 20:25:02 -08:00
Samuel Clay
6698967021 Handling twitter issues. 2016-11-21 13:15:50 -08:00
Samuel Clay
e549b1d16c Sharing stories should use latest story, not earlier story with changes. 2016-11-20 19:37:00 -08:00
Samuel Clay
8bbd280718 Not showing story diffs in blurblogs. 2016-11-20 19:23:53 -08:00
Samuel Clay
191df1edf4 Fixing hinting. 2016-11-10 17:59:47 -08:00
Samuel Clay
2e50642b4b Another missing field. 2016-11-10 17:49:52 -08:00
Samuel Clay
59aac74f42 Continuing to add index hints to shared stories. 2016-11-09 11:32:51 -08:00
Samuel Clay
d7e2c5d3b0 Using hints on shared stories index. 2016-11-09 11:28:53 -08:00
Samuel Clay
5c11f12834 Fixing a bad index on blurblogs. 2016-11-09 11:16:05 -08:00
Samuel Clay
de675b03a6 Upgrading tweepy, hoping it fixes auth issues w/ twitter. 2016-05-27 08:58:27 -07:00
Samuel Clay
849a194e29 Only subscribed users can read newsletters. This prevents users who aren't the original recipient from sharing or reading other user's newsletters. 2016-03-17 11:22:05 -07:00
Samuel Clay
34228e3b77 Handling search queries with just spaces in them. 2016-01-28 11:41:01 -08:00
Samuel Clay
6f4c9fba36 Revert "Revert "Merge branch 'charts2'""
This reverts commit d5a480a4c8.
2016-01-05 11:32:36 -08:00
Samuel Clay
d5a480a4c8 Revert "Merge branch 'charts2'"
This reverts commit 02909962d4, reversing
changes made to 6be803a08f.
2016-01-05 11:08:40 -08:00
Samuel Clay
0fe3dc78e4 Patching charts to fix broken charts branch. 2015-11-30 09:31:10 -08:00
Samuel Clay
5796c00a0b Finishing up last scroll position. Needs to take into account any images, which are throwing off the scroll positions. 2015-09-17 13:15:10 -07:00
Samuel Clay
22ce6d8026 Fixing last of commentless shares on ios. Ready to roll with scroll position saving. 2015-09-16 20:41:06 -07:00
Samuel Clay
4a82e187c3 Same as 44ac8a027a, but for socialsubs. 2015-09-03 15:18:13 -07:00
Samuel Clay
d0c7e955c7 Showing user ip in social pages. 2015-07-29 13:43:18 -07:00
Samuel Clay
a983d1afe5 Showing user agent in social pages. 2015-07-29 13:37:12 -07:00
Samuel Clay
1a578193a4 Updating to latest pymongo and mongoengine. 2015-07-20 16:44:50 -07:00
Samuel Clay
b27590506c Fixing notuniqueerrors. 2015-07-07 13:34:06 -07:00
Samuel Clay
469e591bde Handling missing shared story when liking a comment. 2015-07-07 13:28:43 -07:00
Samuel Clay
b65c157d86 Adding story_hash to interactions and activities. (For #693). Note that comment_like's may have a null story_hash, although future comment_like's wont. 2015-06-04 15:38:21 -07:00
Samuel Clay
54c5503514 Handling missing twitter usernames. 2015-04-07 10:55:29 -07:00