Commit graph

13368 commits

Author SHA1 Message Date
Samuel Clay
6b54fb6bb0 Merge branch 'django1.8' into django1.9
* django1.8:
  De-vendorizing django-paypal
  Vendorizing paypal
  Re-vendorizing django-paypal until django 1.11 upgrade is complete.
  Downgrading django-paypal to deal with django1.5 -> django1.11 issue and IPN.
  Fixing feeds failed fetch monitor.
2020-11-13 19:42:38 -05:00
Samuel Clay
859b9d1b25 Merge branch 'django1.7' into django1.8
* django1.7:
  De-vendorizing django-paypal
  Vendorizing paypal
  Re-vendorizing django-paypal until django 1.11 upgrade is complete.
  Downgrading django-paypal to deal with django1.5 -> django1.11 issue and IPN.
  Fixing feeds failed fetch monitor.
2020-11-13 19:42:27 -05:00
Samuel Clay
09f8cb3712 Merge branch 'django1.6' into django1.7
* django1.6:
  De-vendorizing django-paypal
  Vendorizing paypal
  Re-vendorizing django-paypal until django 1.11 upgrade is complete.
  Downgrading django-paypal to deal with django1.5 -> django1.11 issue and IPN.
  Fixing feeds failed fetch monitor.
2020-11-13 19:42:20 -05:00
Samuel Clay
2931551a38 De-vendorizing django-paypal 2020-11-13 19:42:12 -05:00
Samuel Clay
d29dce7d2e Merge branch 'master' into django1.6
* master:
  Vendorizing paypal
  Re-vendorizing django-paypal until django 1.11 upgrade is complete.
  Downgrading django-paypal to deal with django1.5 -> django1.11 issue and IPN.
  Fixing feeds failed fetch monitor.
2020-11-13 19:41:23 -05:00
Samuel Clay
31c625f099 Vendorizing paypal 2020-11-13 19:39:37 -05:00
Samuel Clay
45f8742063 Re-vendorizing django-paypal until django 1.11 upgrade is complete. 2020-11-13 19:30:39 -05:00
Samuel Clay
e04222c483 Downgrading django-paypal to deal with django1.5 -> django1.11 issue and IPN. 2020-11-13 18:39:16 -05:00
Samuel Clay
516f6c5631 Fixing feeds failed fetch monitor. 2020-11-12 19:19:42 -05:00
Samuel Clay
723a28de37 Merge branch 'django1.8' into django1.9
* django1.8:
  Adding feed unread count refresh when changing intelligence level.
  Task fetches error.
2020-11-12 18:41:05 -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
5ebe8c76b9 Merge branch 'django1.6' into django1.7
* django1.6:
  Adding feed unread count refresh when changing intelligence level.
  Task fetches error.
2020-11-12 18:40:56 -05:00
Samuel Clay
ad8366c7e4 Merge branch 'master' into django1.6
* master:
  Adding feed unread count refresh when changing intelligence level.
  Task fetches error.
2020-11-12 18:40:50 -05:00
Samuel Clay
edc2d3c938 Adding feed unread count refresh when changing intelligence level. 2020-11-12 18:37:30 -05:00
Samuel Clay
3621539106 Task fetches error. 2020-11-12 18:25:38 -05:00
Samuel Clay
f1cc411ab7 Merge branch 'django1.8' into django1.9
* django1.8:
  Only warn on old systems with broken swapfile.
  httplib2 causing pip issues.
  De-vendorizing paypal.
2020-11-12 18:13:30 -05:00
Samuel Clay
9ff93df701 Merge branch 'django1.7' into django1.8
* django1.7:
  Only warn on old systems with broken swapfile.
  httplib2 causing pip issues.
  De-vendorizing paypal.
2020-11-12 18:12:53 -05:00
Samuel Clay
61cfacdf14 Merge branch 'django1.6' into django1.7
* django1.6:
  Only warn on old systems with broken swapfile.
  httplib2 causing pip issues.
  De-vendorizing paypal.
2020-11-12 18:11:52 -05:00
Samuel Clay
dde3538371 Merge branch 'master' into django1.6
* master:
  Only warn on old systems with broken swapfile.
  httplib2 causing pip issues.
  De-vendorizing paypal.
2020-11-12 18:11:21 -05:00
Samuel Clay
d98552d75b Only warn on old systems with broken swapfile. 2020-11-12 18:10:30 -05:00
Samuel Clay
a2c0004130 httplib2 causing pip issues. 2020-11-12 17:43:29 -05:00
Samuel Clay
c91fbf0b32 De-vendorizing paypal. 2020-11-12 17:38:09 -05:00
Samuel Clay
32b56aee0e Merge branch 'django1.8' into django1.9
* django1.8:
  Datetime needs to evaluate.
  Testing backups.
  Fixing missing Android receipt.
  Adding controls to twitter videos.
2020-11-12 15:40:05 -05:00
Samuel Clay
f7e74b13d2 Merge branch 'django1.7' into django1.8
* django1.7:
  Datetime needs to evaluate.
  Testing backups.
  Fixing missing Android receipt.
  Adding controls to twitter videos.
2020-11-12 15:39:23 -05:00
Samuel Clay
df587a8268 Merge branch 'django1.6' into django1.7
* django1.6:
  Datetime needs to evaluate.
  Testing backups.
  Fixing missing Android receipt.
  Adding controls to twitter videos.
2020-11-12 15:39:14 -05:00
Samuel Clay
21b8204393 Merge branch 'master' into django1.6
* master:
  Datetime needs to evaluate.
  Testing backups.
  Fixing missing Android receipt.
  Adding controls to twitter videos.
2020-11-12 15:39:02 -05:00
Samuel Clay
21749b64a8 Datetime needs to evaluate. 2020-11-12 15:38:31 -05:00
Samuel Clay
1c0ca321fb Testing backups. 2020-11-12 10:11:56 -05:00
Samuel Clay
2592254d95 Fixing missing Android receipt. 2020-11-12 10:11:48 -05:00
Samuel Clay
5d3dff726a Adding controls to twitter videos. 2020-11-09 19:29:58 -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
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
Samuel Clay
d1b5c161b1 Merge branch 'master' into django1.6
* master: (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:37:52 -05:00
Samuel Clay
5813e80a50 Merge branch 'dejal'
* dejal:
  #1377 (mark as read for titles only)
  iOS: project upgrade check
2020-11-02 11:35:30 -05:00
Samuel Clay
d5432f4661 Styling new features for dark mode. 2020-10-28 13:03:00 -04:00
Samuel Clay
16b50b5110 Adding style option for grid height. XS/S/M/L/XL 2020-10-28 11:51:42 -04:00
David Sinclair
00d3901fea Merge branch 'master' into dejal 2020-10-27 13:07:08 -07:00
Samuel Clay
f1802c29c4 Merge branch 'sictiru'
* sictiru: (27 commits)
  Android v10.1b7.
  #1364 In App Review
  #1369 Notification alerts. Skip old stories
  Android v10.1b6.
  #1239 Feed statistics
  Target SDK to 29 again
  API 29 upgrade
  Android v10.1b5.
  #1343 Mute dialog sites counter and sites reset
  #1343 Feed Chooser. Widget and Mute configs
  #1343 Premium Expiration. Konfetti
  #1343 Premium Account
  #1343 Subscription details
  Android v10.1b3.
  Android v10.1b2.
  #1356 Login issue
  Gradle properties
  #1343 Billing client
  #1343 Going premium screen
  #1343 Reading by folder. Searching feeds
  ...
2020-10-27 13:20:00 -04:00
Samuel Clay
eeca7539d9 Adding applinks to .well-known/apple app json. For #1361. 2020-10-27 12:16:41 -04:00
David Sinclair
a433bfbc8d #1377 (mark as read for titles only)
- Easy fix, using a smaller offset if title only.
2020-10-26 20:05:14 -07:00
David Sinclair
0ff50f7edb iOS: project upgrade check 2020-10-26 19:23:11 -07:00
Samuel Clay
f7ff0f7c1f https for all links. 2020-10-22 20:15:57 -04:00
Samuel Clay
78c290e98d Saving saved story slugs. 2020-10-22 20:14:11 -04:00
Samuel Clay
b01aa852f7 Slugifying saved story tags that have no slugs. 2020-10-22 20:12:56 -04:00
Samuel Clay
47b80d95af Adding ssl to db machines. 2020-10-21 19:57:17 -04:00
Samuel Clay
0f361a6558 Fixing subscription cancelation error messge. 2020-10-19 15:07:14 -04:00
Samuel Clay
73dc58cc92 Android v10.1b7. 2020-10-19 13:27:18 -04:00
Andrei
e3ecea59ac Merge branch 'sictiru' of https://github.com/samuelclay/NewsBlur into sictiru 2020-10-10 17:31:50 -07:00
sictiru
00ad1612fb #1364 In App Review 2020-10-10 17:28:30 -07:00