Commit graph

65 commits

Author SHA1 Message Date
Samuel Clay
427d171203 Adding delete user flow. About time, since I'm sick of doing this myself. 2013-01-03 10:33:22 -08:00
Samuel Clay
20401fefab Showing payment history. 2012-12-03 15:03:47 -08:00
Samuel Clay
284c0aafbe Fixing bug when setting autofollow_friends to false when the user has not setup any twitter/fb login details. 2012-08-12 16:50:42 -07:00
Samuel Clay
c4dc6a1ae1 Merge branch 'social' into redis
* social:
  Refactoring social profiles so that even new users have profiles. Thanks to @roycyang's new db setup for finding all of this.
  Fixing bug if a user has no social profile.

Conflicts:
	apps/social/views.py
2012-07-25 23:58:01 -07:00
Samuel Clay
8f28065154 Refactoring social profiles so that even new users have profiles. Thanks to @roycyang's new db setup for finding all of this. 2012-07-25 23:57:10 -07:00
Samuel Clay
09b7b44ab3 Merge branch 'social' into redis
* social:
  Adding youtube video embeds back in.
  Allowing empty email to be set.
  Fixing issue in munin postgres fabfile.
  Adding postgres standby commands + munin.
2012-07-20 11:18:28 -07:00
Samuel Clay
f8e0f46ea2 Allowing empty email to be set. 2012-07-20 10:39:14 -07:00
Samuel Clay
2c69fc7edc Merge branch 'social' into redis
* social:
  Fixing interactions and activities to only pull what's necessary. Otherwise doubles show up in android + ios.
  Updating the shortcut text for sidebar collapsing.
2012-07-18 23:08:43 -07:00
Samuel Clay
4383b1148d Fixing interactions and activities to only pull what's necessary. Otherwise doubles show up in android + ios. 2012-07-18 23:06:43 -07:00
Samuel Clay
0d5a16dc15 Finishing sort by oldest/newest and show only unread/all stories. 2012-07-18 20:19:54 -07:00
Samuel Clay
74bb4780ea Adding dashboard date and auto-highlighting new interactions, to be cleared on dashboard view. 2012-04-21 18:20:49 -07:00
Samuel Clay
deff56dc76 Fixing username changes. 2012-04-20 08:45:29 -07:00
Samuel Clay
40c8171f42 Fixing broken paging on user activities. 2012-04-19 19:18:22 -07:00
Samuel Clay
6053de66be Fixing broken paging on user activities. 2012-04-19 19:17:06 -07:00
Samuel Clay
aa42f098cf Adding a ton of activities. Fixing numerous bug saround interactions. 2012-04-16 11:21:52 -07:00
Samuel Clay
4612bedb49 Adding paging to interactions and activities on dashboard. 2012-04-12 11:18:56 -07:00
Samuel Clay
8f0afbb7c2 All setup module items now disappear/appear or show a Done title appropriately. 2012-03-19 14:15:38 -07:00
Samuel Clay
98b45a5e84 Autofollowing preference now saved. 2012-03-07 16:32:02 -08:00
Samuel Clay
aaa5aa1cd6 Merge branch 'master' into social
* master:
  Changing copy on premium/feedchooser dialog.
  Styling errors on stripe payment form.
  Final stripe.js tweaks before launch.
  Adding Pay by Credit Card as an option to feed chooser dialog. Thus concludes Stripe.js integration. Time to launch!
  Styling the stripe.js background.
  Using correct kwargs for stripe signal.
  Wrapping up stripe.js form. Has validation, styling, and does the right thing for new subscriptions. Needs a link to the form, though.
  Setting up correct customer model for stripe webhook.
  Moving JS assets to bottom of the page for faster loadtimes.
  Fixing exception on missing param in feed address searching.
  Fixing recommendation date serialization bug.
  Fixing bugs around login with blank password using full password. Also fixing bug in signups with no username.
  Stripe.js payments using zebra. Adding zebra as a vendored dependency. Webhooks and views all in. Needs styling, custom username and email fields, and loads of testing.
  Adding error checking on requests in page fetching.
  Using a probability from redis to determine whether or not to skip a fetch.
  Allowing any password to be used on accounts with no password set.
  Adding paypal logo.

Conflicts:
	assets.yml
	media/js/newsblur/reader/reader_feedchooser.js
	settings.py
	templates/base.html
2012-02-29 16:22:47 -08:00
Samuel Clay
fa917389a8 Adding Pay by Credit Card as an option to feed chooser dialog. Thus concludes Stripe.js integration. Time to launch! 2012-02-29 12:15:01 -08:00
Samuel Clay
c9866c087d Wrapping up stripe.js form. Has validation, styling, and does the right thing for new subscriptions. Needs a link to the form, though. 2012-02-28 17:37:01 -08:00
Samuel Clay
29234a8bac Stripe.js payments using zebra. Adding zebra as a vendored dependency. Webhooks and views all in. Needs styling, custom username and email fields, and loads of testing. 2012-02-27 21:46:34 -08:00
Samuel Clay
87f6c541b5 Showing unread stories. I don't think this works at all yet, but it should. 2012-01-26 09:54:48 -08:00
Samuel Clay
2b9ad97b51 Switching a ton of feed and user fetches to simple ID matches. ".user.pk -> .user_id" 2012-01-26 09:32:24 -08:00
Samuel Clay
638963f31a Adding profile photos, hiding of completed Getting Started items, following and auto-following of new friends, creating connections. 2011-12-24 00:30:37 -08:00
Samuel Clay
5571fb7202 Vendoring paypal. 2011-10-19 18:14:56 -07:00
Samuel Clay
ed7d2bd88f Finishing up new account email. Adding migration to save email sending preference. 2011-09-21 17:49:40 -07:00
Samuel Clay
d4dddf4896 Adding iphone and android apps, along with necessary migration for hiding mobile. 2011-08-07 21:38:09 -07:00
Samuel Clay
811512d8da Finishing up account dialog. Also re-styling subscriber counts. 2011-07-27 22:17:34 -07:00
Samuel Clay
ff50d85d7d Updating a bunch of defaults to make NewsBlur installable on anybody's machine. Fleshing out README installation instructions. 2011-07-17 20:53:30 -07:00
Samuel Clay
5adf024dda Finishing all boilerplate to the tutorial. This includes the preference to show/hide tutorial, and hiding the dashboard module. 2011-05-13 10:15:56 -04:00
Samuel Clay
913fc49c3a Adding profile field for completing the tutorial. 2011-05-12 18:15:15 -04:00
Samuel Clay
dcbd9ecb00 Sending back new preferences, needed for debugging. 2011-03-16 19:24:58 -04:00
Samuel Clay
4ab3904d52 Adding paging on recommendations. Also moved out of profile preferences, since it needs to be used by the base template when setting up the middle column (the column where recommended feeds go). Now a first-order column on user profiles. 2011-03-13 16:24:49 -04:00
Samuel Clay
76e5a62c62 Adding Readability and adding preferences to show/hide any or all services. 2011-02-16 20:45:37 -05:00
Samuel Clay
3723160155 A huge number of misc fixes: fixing potential errors on paypal return screen, mailing all feed/page parse errors, and swithcing to mapreduce item_frequencies in mongoengine. 2011-02-05 15:34:43 -05:00
Samuel Clay
7d6cb14096 Fixing preferences. Accidentally required a change password to correctly close. Whoops. 2010-11-09 11:34:50 -05:00
Samuel Clay
e7646d7e98 Adding change password to Preferences. Also changing timing for feed updates. 2010-11-08 12:09:55 -05:00
Samuel Clay
9c4ee28c6d Adding preference for hiding feeds with no unread stories. 2010-11-05 10:35:52 -04:00
Samuel Clay
905766c7e5 Preferences! Timezone support, new window setting, and default story view. 2010-10-31 16:03:50 -04:00
Samuel Clay
786b3d9982 Fixed a bunch fo bugs around feed chooser, OPML import, google reader import, and counts. Also added preferences for new windows, timezone support, and default views. This is one loaded commit. 2010-10-30 00:27:52 -04:00
Samuel Clay
d0e25a0716 Updating feed polling intervals. Also adding a progress bar to premium upgrading screen. Should make for a smoother transition for those high-feed subscribers. 2010-10-29 12:28:05 -04:00
Samuel Clay
10f58f8608 Renaming json.py to json_functions.py to resolve namespace conflict with anyjson. 2010-10-23 13:06:28 -04:00
Samuel Clay
a1510a3c94 Using Paypal Production. Flipping the switch. 2010-10-23 11:34:11 -04:00
Samuel Clay
143adc6d77 Working on sandbox until i know this is right. 2010-10-23 11:22:57 -04:00
Samuel Clay
6b0d2f457c Refactoring activation of premium accounts. Trying out production paypal. 2010-10-23 11:20:54 -04:00
Samuel Clay
fd71c60dab Adding domain to paypal button. 2010-10-23 11:13:44 -04:00
Samuel Clay
9437b9c096 Adding loading bar to paypal return. 2010-10-23 10:46:35 -04:00
Samuel Clay
169c9327d2 Error conditions for failing Paypal IPN. 2010-10-23 10:40:25 -04:00
Samuel Clay
870af936ca Adding paypal ipn checks for premium status. Still needs a count fo the number of tries for failure status. 2010-10-22 10:22:19 -04:00