public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4238 commits 2 branches 0 tags 863 MiB
Commit graph

142 commits

Author SHA1 Message Date
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
85eb73b1a7 Using correct kwargs for stripe signal. 2012-02-28 17:39:02 -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
45bb45c9e5 Setting up correct customer model for stripe webhook. 2012-02-28 13:14:45 -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
603ac08faa Merge branch 'master' into social 
* master:
  Allow login from signup form.
  Reducing celery prefetch to get more accurate queue sizes.
  Removing RabbitMQ dependency. Moving to redis for task queuing.
  Counting queue size for celery/redis.
  Switching to redis to feed queuing. Also adding a weight for skipping feed fetches under high load.
  Skipping feed resurrection.
  Fixing last update problem that has been choking feed fetchers.
  Fixing last update problem that has been choking feed fetchers.
  Typo in feed pool drain.
  Adding ability to wind down feed queue by faking requests.
  Adding debug message about counting errors.

Conflicts:
	fabfile.py
 2012-02-27 13:13:27 -08:00
Samuel Clay
fcb78b3133 Allow login from signup form. 2012-02-27 13:11:55 -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
ae367bf8ba Fixing a range of server issues -- sendign story emails, failing silently on SES outages, and giving a 404 instead of a 500 on bad params. 2011-10-28 10:29:11 -07:00
Samuel Clay
8fb9bdd7db Adding luminosity detection for the iphone river. Also fixing marking stories as read and tagging a river request. 2011-10-26 20:09:28 -07:00
Samuel Clay
5571fb7202 Vendoring paypal. 2011-10-19 18:14:56 -07:00
Samuel Clay
5876310bf4 Handling error on emails for new premiums. 2011-10-19 09:40:31 -07:00
Samuel Clay
49433e1f58 Updating user email when activating premium. 2011-10-06 10:45:16 -07:00
Samuel Clay
622358e05c Moving to $ per year instead of per month. Cleaning up new account email. Clearing out the story iframe between stories and feeds. 2011-09-30 18:02:48 -07:00
Samuel Clay
c83f11e668 Adding /load_feeds to repeat visitor tracking, since the iPhone app never hits refresh_feeds. 2011-09-25 09:53:57 -07:00
Samuel Clay
16b1ab6f9c Adding logging for emails sent. Also using history.replaceState to clear the ?next= parameter. 2011-09-23 18:13:16 -07:00
Samuel Clay
f29266d707 Adding forgot password email with conveniences. 2011-09-22 09:23:42 -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
482076d1de Adding autologin (with optout param) for use with emails. 2011-09-19 09:46:36 -07:00
Samuel Clay
afae94cf7d Templating emails -- new account and new premium. 2011-09-19 08:56:16 -07:00
Samuel Clay
c051bcfac9 Adding browser user agent to all logging. 2011-09-16 09:26:22 -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
56e0292197 Using new django1.3 logging. Adding SQL middleware for use in development. Pretty SQL. 2011-05-08 19:25:58 -04:00
Samuel Clay
54a10301b9 Adding community feedback to whats new module on dashboard. 2011-05-07 12:06:51 -04:00
Samuel Clay
909339381a Statistics graph. 2011-04-15 11:34:41 -04:00
Samuel Clay
8e2936fc1b Utils -> vendor 2011-04-11 21:57:45 -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
de80258365 Adding *'s to premium users during logging. 2011-02-23 13:46:47 -05: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
68a2d9370c Fixing stale feed refreshing by using the correct IDs. 2011-01-31 00:09:33 -05:00
Samuel Clay
aeab6ed994 Refactoring queue_new_feeds as to be accessible from everywhere, and to correctly queue new feeds and stale feeds that aren't new. 2011-01-30 23:56:51 -05:00
Samuel Clay
8afdbd8ab0 Adding bookmarklet modal. Also adding the api app, which will handle incoming bookmarklet site adds. Uses a new privacy token to generate a unique URL for each user, so only they can add sites, no login needed. 2011-01-20 09:57:23 -05:00
Samuel Clay
03981d8867 Only queueing stale feeds if there are any to queue. 2011-01-18 08:45:35 -05:00
Samuel Clay
7fdd173ac0 Refreshing stale feeds for old users returning. 2011-01-17 14:20:36 -05:00
Samuel Clay
976e4fd33d Changing log colors for imports. Also starting to fill out the fabfile.py, which needs a lot of love. 2010-12-15 22:26:05 -05:00
Samuel Clay
725d4e5905 A whole bunch of colored logs. 2010-12-05 21:05:34 -05:00
Samuel Clay
cbe5df95aa A few color logging tweaks. 2010-12-05 17:15:58 -05:00
Samuel Clay
9f4cdf2288 A few color logging tweaks. 2010-12-05 16:59:48 -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