Commit graph

213 commits

Author SHA1 Message Date
Samuel Clay
2592254d95 Fixing missing Android receipt. 2020-11-12 10:11:48 -05:00
Samuel Clay
caad01e194 Merge branch 'django1.9' into django1.10
* django1.9: (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:28 -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
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
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
Jonathan Math
524045fdf6 add backend argument to login_user functions because there are two backends 2020-07-03 02:20:42 -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
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
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
cef0ebf66d Using request body for ios subscription. 2020-06-25 09:30:59 -04:00
Samuel Clay
cdda78d916 De-vendorizing django-paypal, adding to requirements.txt. 2020-06-24 16:59:43 -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
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
af6db197d5 Merge remote-tracking branch 'origin/django1.6' into django2.0 2020-06-23 00:46:40 -04:00
Jonathan Math
ba948e56f5 add request parameter to render function in apps/profiles/views.py login view 2020-06-20 00:28:19 -04:00
Jonathan Math
7112b19f18 upgrade middleware classes and run 2to3 on apps/profile/ 2020-06-17 00:40:16 -04:00
Samuel Clay
040855fe18 More iOS sub details. 2020-06-15 09:57:23 -04:00
Samuel Clay
694f14ff46 Need more data on ios subscription status. 2020-06-15 09:51:03 -04:00
jmath1
a61e1a7b99 Remove use of RequestContext and change render_to_response to render 2020-06-12 01:27:07 -04:00
Samuel Clay
2babac75ca REQUEST -> POST 2020-06-08 11:25:52 -04:00
Samuel Clay
e6b7642b7b REQUEST -> POST 2020-06-08 11:25:23 -04:00
Samuel Clay
4653d23dde REQUEST -> GET 2020-06-08 11:24:42 -04:00
jmath1
cceedbf007 change mimetype to content_type 2020-06-08 00:10:52 -04:00
jmath1
3f8b0655d4 change mimetype to content_type and stop using request.REQUEST 2020-06-07 08:04:23 -04:00
Samuel Clay
7cd4e2f5b9 Merge branch 'master' into recaptcha
* master: (618 commits)
  Build 107
  iOS v9.1.1, still in development.
  #1249 (dark theme colors)
  iOS: #1254 (settings with stories on bottom)
  iOS: #1257 (highlighting issue)
  iOS: #1258 (crash on start)
  Fixing #1251, twitter error should specify the correct dialog.
  Facebook connect url
  Typo
  Hardcoding facebook url
  https for oauth
  add touch intent to widget initialization instead of only refresh
  Handling ImportError
  Handling MemoryError.
  Adding rate limiting logging.
  Handling missing stories from newsletters.
  Handling missing users on clean spammer.
  Upgrading psychopg.
  v9.1 ios.
  Slight change in colors.
  ...
2019-10-25 14:35:59 -04:00
Samuel Clay
a1a0a770ea Renaming check_premium to set_premium_expire. 2019-09-09 21:17:10 -04:00
Samuel Clay
cf59309025 Adding iOS subscription status notification. 2019-08-29 10:33:53 -07:00
Samuel Clay
47a9b999db Don't duplicate Stripe payments. 2019-08-22 20:07:16 -07:00
Samuel Clay
f3a94a6393 Sanity check. If expiration more than a year out, charge immediately. 2018-07-24 11:43:16 -04:00
Samuel Clay
d5a6d715e2 Ensuring premium expiration when setting billing, just in case user has a gift. 2018-07-24 11:37:46 -04:00
Samuel Clay
1b70e9e184 Canceling subscription if using old sub. Upgrading to newer. 2018-07-24 11:27:38 -04:00
Samuel Clay
aeab079ffe No more billing cycle anchor unless explicit. 2018-07-24 11:10:27 -04:00
Samuel Clay
39c65773b6 Handling stripe renewal form for non-expiring premiums. 2018-07-24 11:07:34 -04:00
Samuel Clay
e5874fee7f Stripe list count is now total_count. 2018-07-24 10:58:43 -04:00
Samuel Clay
5c1942f488 card -> source 2018-07-24 10:54:36 -04:00
Samuel Clay
e237491163 Billing cycle anchor used for trial as to not prorate renewing charges. 2018-07-24 10:50:59 -04:00
Samuel Clay
9a9d72e318 Don't create new Stripe account on renewal. 2018-07-24 10:47:43 -04:00
Samuel Clay
0867830706 Fixing major Stripe bug where changing a CC# would not correctly update the subscription, so some users would change their credit card but never receive a bill, either immediately if they were expired or on the correct expiration date. Both cases now fixed. 2018-07-20 11:39:44 -04:00
Samuel Clay
5952e0b4b0 Better language around renewing and changing credit cards. 2018-05-03 15:38:59 -07:00
Samuel Clay
baa3463213 Adding grace period to stripe customer check. 2018-04-27 10:26:41 -07:00
Samuel Clay
9abe68bc1c Saving iOS receipts logs. 2018-02-07 12:46:28 -08:00
Samuel Clay
8a72ca7edb Finishing recaptcha. Ok to launch. 2017-12-08 16:43:30 -08:00
Samuel Clay
8fe07dc701 Storing iOS payment transaction identifier so as to not upgrade a user multiple times. 2017-11-15 17:26:27 -08:00
Samuel Clay
aeb19c1af6 No more need for a price, just send the receipt. 2017-11-10 16:01:44 -08:00
Samuel Clay
d3eafcd411 Stubbing in server premium activation for ios in-app purchasing. 2017-11-10 15:12:54 -08:00
Samuel Clay
9079af45d3 Adding paypal payer email for convenience. 2017-03-30 11:12:21 -07:00
Samuel Clay
94fe3a9705 Improving messaging on emails that have OPML backups. Thanks to @frenetic for bringing this up. Closes #1003 2017-03-18 14:41:12 -07:00
Samuel Clay
d444566ecc Splitting intelligence trainer counts into + and - 2016-03-20 17:16:23 -07:00