Commit graph

258 commits

Author SHA1 Message Date
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
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
Samuel Clay
68e2faa561 New stripe id model, recording all stripe purchases. 2018-05-01 14:18:59 -07:00
Samuel Clay
00f0e451bc Retrieve stripe IDs stubbed in. 2018-04-27 10:26:56 -07:00
Samuel Clay
436d4ccff3 Fixing annual 2018-04-17 19:16:55 -07:00
Samuel Clay
01ea376471 Payment history feed 2018-04-17 19:13:44 -07:00
Samuel Clay
04cecd2638 Sanity check on spam killer. 2018-01-18 16:10:41 -08:00
Samuel Clay
3c052eadd9 Logging failed ios upgrades. 2018-01-08 13:40:30 -08:00
Samuel Clay
059e47118a Fixing logic error in annual revenue estimate. 2017-12-14 16:12:45 -08:00
Samuel Clay
576b2545b7 Yearly revenue guestimate. 2017-12-14 16:07:10 -08:00
Samuel Clay
ea97797c3d Yearly revenue guestimate. 2017-12-14 16:06:22 -08:00
Samuel Clay
a0d910cf30 Adding average to predicted month total revenue. 2017-12-14 15:47:22 -08:00
Samuel Clay
4829af3766 Clean rounded floats. 2017-12-14 15:43:26 -08:00
Samuel Clay
210760b511 Round floats. 2017-12-14 15:42:02 -08:00
Samuel Clay
f04e879a96 Python needs explicit floats. 2017-12-14 15:41:23 -08:00
Samuel Clay
900536e517 Adjusting month payment reporting to include forecast. 2017-12-14 15:38:59 -08:00
Samuel Clay
dd35142dce Correctly setting up premium history for ios subscription. 2017-11-15 18:01:55 -08:00
Samuel Clay
0bbb891ea6 Adding payment history payment identifier. 2017-11-15 17:45:38 -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
f4142a498f Moving to timestamp premium expire for localization. 2017-11-15 11:05:24 -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
6a14163eb7 Handling non expiring premium getting premium expiration. This is only used for testing. 2017-09-18 08:34:49 -07:00
Samuel Clay
6c24e09a78 Custom CSS and Custom JavaScript, saved on the server. 2017-05-18 16:59:35 -07:00
Samuel Clay
461c1c4b65 Changing feed log format to include id at the beginning. Also normalizing all feed titles in logs for better searchability. 2017-03-31 19:52:24 -07:00
Samuel Clay
9079af45d3 Adding paypal payer email for convenience. 2017-03-30 11:12:21 -07:00
Samuel Clay
5d6ad89bf6 Adding template for Turn Touch end campaign email. 2017-03-08 18:04:57 -08:00
Samuel Clay
fea8ac5e8a Turn Touch launch email 2016-09-30 23:49:15 -07:00
Samuel Clay
0f644dcb7e Adding current month totals to payment reports. 2016-05-05 19:09:09 +08:00
Samuel Clay
a420d41cda Adding MTD to payment reports. 2016-05-05 19:05:06 +08:00
Samuel Clay
a22a3fe1f7 Ignoring feedsportal. 2016-04-18 16:17:15 -07:00
Samuel Clay
fd26addf28 Adding YTD figures to payment reports. 2016-04-18 14:58:56 -07:00
Samuel Clay
e72a17a346 Maybe I shouldn't be coding right now. That errant 'else' keyword looked fine in word wrap. 2016-03-20 18:04:36 -07:00