public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
12994 commits 16 branches 14 tags 926 MiB
Commit graph

144 commits

Author SHA1 Message Date
Jonathan Math
7112b19f18 upgrade middleware classes and run 2to3 on apps/profile/ 2020-06-17 00:40:16 -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
Samuel Clay
dcc942c9c6 Undoing story change preference. Now story changes are loading through ajax. 2016-02-26 20:01:41 -08:00
Samuel Clay
454eb3d0d8 Moving from hide changes to show changes. Needs migration. Also needs feed stories to match profile pref. 2016-02-24 11:52:50 -08:00
Samuel Clay
1bd81bdb2a Adding clear overrides to story order and read filter (all/unread) in preferences, to match clear override buttons for story layout and story view. 2015-07-29 17:27:43 -07:00
Samuel Clay
e41106dce3 Adding IP to admin. 2015-07-21 10:55:17 -07:00
Samuel Clay
1a578193a4 Updating to latest pymongo and mongoengine. 2015-07-20 16:44:50 -07:00
Samuel Clay
0711ba124d Whoops, forgotten import. 2015-07-09 20:09:35 -07:00
Samuel Clay
c538831f86 Switching free premiums to gift code based premiums. 2015-07-09 20:08:34 -07:00
Samuel Clay
552311517d Adding new model for gift codes. Can now use gift codes for premium accounts. 2015-06-30 16:06:10 -07:00
Samuel Clay
5e6806e96a Logging emails during signup. 2015-06-27 10:59:06 -07:00
Samuel Clay
e0b4c1fc64 Adding never expire button to admin dialog. Also adding training counts. 2015-06-04 11:27:46 -07:00
Samuel Clay
d9fa2b7a65 Only updating premium expire when checking. 2015-05-19 17:05:01 -07:00
Samuel Clay
d119b94c75 Adding a never_expire flag when upgrading premiums. 2015-05-18 17:27:24 -07:00
Samuel Clay
645018c1f1 Adding link in preferences to clear all overridden story layouts and story views. 2015-02-10 14:45:03 -08:00
Samuel Clay
bb092dc450 Moving from global story layout to per-site story layout. Needs work when switching layouts while on an active story. 2015-02-06 13:28:55 -08:00
Samuel Clay
8958033726 Merge branch 'master' into organizer 
* master: (115 commits)
  Adding webhooks url for paypal.
  Better payment reports.
  Adding changelog to enterprise deployment. Fixing share dialog on ipad.
  iOS app v4.6b1.
  Android app v4 beta 7.
  Coloring cursor when adding tag.
  Adding story tags to add tag popover.
  Adding a tag. Ship it!
  Fixing issue with off-by-1 numbers when changing tags. Also hiding tags with no stories.
  Custom headers for saved story tags.
  Better zgrep.
  Fixing issues with saving starred story tags on ios. Nearly ready.
  Don't recalculate virtual intel column; use it.
  Remove unnecessary loader resets in story list.
  Don't show inappropriate context menu items for saved stories.
  Lower sync priority and fewer unnecessary syncs.
  Start story list loader as soon as possible.
  Generalise out all story list view creation logic.
  Move saved item list to in-time adapter creation.
  Move folder item list to in-time adapter creation.
  ...

Conflicts:
	clients/android/NewsBlur/AndroidManifest.xml
	clients/android/NewsBlur/src/com/newsblur/activity/ItemsList.java
	clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
	clients/android/NewsBlur/src/com/newsblur/database/DatabaseConstants.java
	clients/android/NewsBlur/src/com/newsblur/database/FolderListAdapter.java
	clients/android/NewsBlur/src/com/newsblur/fragment/AllSharedStoriesItemListFragment.java
	clients/android/NewsBlur/src/com/newsblur/fragment/AllStoriesItemListFragment.java
	clients/android/NewsBlur/src/com/newsblur/fragment/FeedItemListFragment.java
	clients/android/NewsBlur/src/com/newsblur/fragment/FolderListFragment.java
	clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
	clients/android/NewsBlur/src/com/newsblur/fragment/SocialFeedItemListFragment.java
	clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
	clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
	clients/ios/Classes/NewsBlurAppDelegate.h
	clients/ios/Classes/StoriesCollection.m
	clients/ios/Classes/StoryDetailViewController.m
	clients/ios/NewsBlur.xcodeproj/project.pbxproj
	clients/ios/static/storyDetailView.css
 2014-11-17 12:40:19 -08:00
Samuel Clay
375cd17663 Handling the transfer of codes through the login flow for redeeming gifts. 2014-11-06 15:01:25 -08:00
Samuel Clay
6414b06873 Adding gift code logs. 2014-11-06 14:55:27 -08:00
Samuel Clay
2b40b9a8f3 Adding inital gift code handling. 2014-11-06 14:41:55 -08:00
Samuel Clay
9df9f2300f Adding gift codes. 2014-11-06 13:41:08 -08:00