Commit graph

388 commits

Author SHA1 Message Date
Samuel Clay
e19972fd0d Found another 2021-01-19 17:33:20 -05:00
Samuel Clay
16d6f4a97c Storing and replacing rivers. Needs favicons fixed. 2021-01-13 15:40:31 -05:00
Samuel Clay
a1f4d67d27 Changing how tasks are called. 2021-01-06 14:42:24 -05:00
Samuel Clay
82fecb23a6 Merge branch 'docker_django3.1' into dashboard3
* docker_django3.1: (117 commits)
  Adding docker to node scripts.
  Removing node_modules from repo
  Whoops
  Better logging for broken paypal ipns.
  Adding RSS Tracker for Windows to Goodies.
  Refactoring socketio so real-time works around username restrictions.
  Socket.IO v3 on the server too.
  Switching to Socket.IO v3.
  Haproxy splitting for socketio 3
  Socket.io 3
  Handling missing feed.
  Only nb.local.com uses ports for websockets.
  Adding GrazeTEN
  Full node install on setup.
  Updating toprc
  correct newsblur to newsblur_web in tasks
  Changing mongodb server.
  Fixing toprc
  Attempting to collect queries for 1% of requests by using DEBUG.
  Fixing mongo install.
  ...
2021-01-05 19:36:49 -05:00
Samuel Clay
6e07dbaf0f Merge branch 'master' into docker_django3.1
* master: (22 commits)
  Whoops
  Better logging for broken paypal ipns.
  Adding RSS Tracker for Windows to Goodies.
  Refactoring socketio so real-time works around username restrictions.
  Socket.IO v3 on the server too.
  Switching to Socket.IO v3.
  Haproxy splitting for socketio 3
  Socket.io 3
  Handling missing feed.
  Only nb.local.com uses ports for websockets.
  Adding GrazeTEN
  Full node install on setup.
  Updating toprc
  Changing mongodb server.
  Fixing toprc
  Attempting to collect queries for 1% of requests by using DEBUG.
  Fixing mongo install.
  Recalculating premium expiration to take into account forced expirations after gifts.
  Fixing never expire -> 1 year
  Adding 1 year expire to admin.
  ...
2021-01-05 19:12:19 -05:00
Samuel Clay
d05b84e673 Whoops 2021-01-05 14:57:46 -05:00
Samuel Clay
8c3fe964f2 Better logging for broken paypal ipns. 2021-01-05 14:55:53 -05:00
Samuel Clay
5aadbc5413 Recalculating premium expiration to take into account forced expirations after gifts. 2021-01-03 17:48:08 -05:00
Samuel Clay
6b43f5a9e6 Saving missing dashboard rivers and correctly placing them. Now to tie data and template together, then add options. 2020-12-10 18:33:43 -05:00
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
f39a0405cf NullBooleanField deprecated 2020-12-09 17:20:08 -05:00
Samuel Clay
05756155b1 Merge branch 'django3.0' into docker_django3.0
* django3.0: (184 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 13:04:39 -05:00
Samuel Clay
b89e7dc429 Merge branch 'django1.11' into django2.0
* django1.11: (152 commits)
  request.raw_post_data -> request.body (django 1.6)
  Upgrading pgbouncer to 1.15.0.
  Finishing off Postgresql 13 upgrade.
  Upgrading to Postgresql 13.
  Ubuntu 20.04
  Fixing supervisor path issues
  Upgrading setuptools
  Fixing flask
  Handling over capacity for twitter.
  Max length for image_urls.
  Properly filtering newsletter feeds.
  Fixing issue with text importer on feed-less urls.
  Removing dependency, fixing encoding issue for pages.
  Fixing DB Monitor.
  Updating User Agent for all fetchers.
  Ignoring VSCode.
  Fixing DB Monitor.
  Updating User Agent for all fetchers.
  Ignoring VSCode.
  Fixing Statistics by fixing how timezones are handled.
  ...
2020-12-03 14:04:26 -05:00
Samuel Clay
ea57237d48 Monkey patching get_user to remove the session authentication introduced in 1.7 and made required in 1.10. After a year we can remove this monkey patching as all users would have logged in by now, recycling their session. 2020-11-09 12:51:02 -05:00
Samuel Clay
0b92bca89d Merge branch 'django1.10' into django1.11
* django1.10: (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:35 -05:00
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
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
Jonathan Math
e49de4c4c5 remove "types" index specification from profile models 2020-11-06 14:44: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
Samuel Clay
d2045b7d06 Adding Android premium activation and receipt saving. For #1343. 2020-08-25 21:08:27 -04:00
Samuel Clay
cc50e3ce10 Monkey patching get_user to remove the session authentication introduced in 1.7 and made required in 1.10. After a year we can remove this monkey patching as all users would have logged in by now, recycling their session. 2020-07-02 17:50:21 -04:00
Samuel Clay
eeb44e3400 Fixing a bunch of feed fetch py3 errors. Fetching now works! 2020-06-30 20:50:30 -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
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
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
Jonathan Math
af6db197d5 Merge remote-tracking branch 'origin/django1.6' into django2.0 2020-06-23 00:46:40 -04:00
Jonathan Math
93686c21d3 fix integrity error issues in profile models 2020-06-20 04:31:48 -04:00
Jonathan Math
bd3423fe9c explicitly encode strings before hashing 2020-06-20 00:27:01 -04:00
Jonathan Math
37aa20a4d4 fix redis.zadd call to use new parameter format as per redis 3.2.0 2020-06-20 00:08:18 -04:00
Jonathan Math
b1c68ef681 fix 'types' key issue in meta variable for classes that inherit mongo.Document 2020-06-20 00:05:32 -04:00
Jonathan Math
e46b2495ce update all models.py files to python3 and django2.0 2020-06-17 00:17:32 -04:00
Samuel Clay
d60ec99f3e Removing additional traces of Google Reader. 2020-06-15 17:53:35 -04:00
jmath1
3a88b5210a Add on_delete argument to ForeignKeyField and OneToOneField fields 2020-06-11 05:45:48 -04:00
Samuel Clay
14a1e8ab0b Handling deleted users when deleting spam accounts. 2020-01-18 14:37:44 -05:00
Samuel Clay
c7091e6772 Adding back in types 2019-12-25 16:06:34 -05:00
Samuel Clay
9ca17dd3b3 Undoing commit that changed story dates. 2019-12-25 15:59:38 -05:00
Samuel Clay
85cbf374ba Handling missing users on clean spammer. 2019-10-03 09:05:28 -04:00
Samuel Clay
a1a0a770ea Renaming check_premium to set_premium_expire. 2019-09-09 21:17:10 -04:00
Samuel Clay
47a9b999db Don't duplicate Stripe payments. 2019-08-22 20:07:16 -07:00
Samuel Clay
8d120ea9c5 Fixing classmethod 2019-07-16 12:02:50 -07:00
Samuel Clay
db33d15d2b Adding stripe history reimport background task. 2019-07-16 12:00:10 -07:00
Samuel Clay
eff7f16682 Better ios payment checker for renewal of subscriptions. 2018-12-16 15:14:14 -05:00
Samuel Clay
87e1cca9c2 Another fix for premium sub activation. 2018-07-23 10:39:11 -04:00
Samuel Clay
cb495b12f4 Fixing issue with activating premium when already premium. 2018-07-22 20:45:11 -04:00
Samuel Clay
99919a2a50 Only auto-enable every feed if a free user is moving to premium 2018-07-20 15:55:15 -04:00
Samuel Clay
b93831609f Preventing double counting of Stripe payments. 2018-07-13 12:28:20 -04:00
Samuel Clay
f5473bbe93 Out of scope error. 2018-05-07 13:22:00 -07:00
Samuel Clay
a65d53f8f7 Not counting failed stripe payments. 2018-05-01 14:29:13 -07:00
Samuel Clay
7fb4457f29 Correct stripe payment count. 2018-05-01 14:26:55 -07:00