1061 commits

Author	SHA1	Message	Date
Matt Lott	2824ea5f9d	Merge branch 'master' into production	2015-03-20 16:18:52 -07:00
Matt Lott	2561bc4caf	🐛Fix Stripe web hook sub deleted for deleted user ... Add check for deleted user in subscription deleted Stripe web hook event handler, and equivalent test case. Add logging for web hook 500 errors to aid future debugging.	2015-03-20 16:14:32 -07:00
Nick Winter	6cde6c00b6	Merge branch 'master' into production	2015-03-20 15:38:33 -07:00
Michael Schmatz	5a7666fca3	More read nearests and changed redirection	2015-03-20 16:33:03 -04:00
Michael Schmatz	d8c21771fc	Merge branch 'master' into china	2015-03-20 16:08:18 -04:00
Nick Winter	da75015f46	Merge branch 'master' into production	2015-03-20 11:10:00 -07:00
Nick Winter	e6f53d437a	Adding zero-sum to simulated ladder levels.	2015-03-20 10:16:19 -07:00
Nick Winter	7714354447	Merge branch 'master' into production	2015-03-20 07:17:41 -07:00
Nick Winter	8b06de9613	Requests without users can't save poll votes.	2015-03-20 07:10:47 -07:00
Nick Winter	927363fd6f	Merge branch 'master' into production	2015-03-19 21:38:06 -07:00
Matt Lott	fec3ac38e9	Prepaid subscriptions ... Admins can generate a prepaid code, which a user can use to subscribe for free via the account/subscription page. The subscription will be identical to the normal monthly subscription (e.g. 3500 gems per month), except they won’t be charged. Does not require the recipient to enter billing information. Can be applied to an existing subscription, which will be converted to free. Prepaid code can only be used once. Prepaid subscription cannot be unsubscribed via the UI.	2015-03-19 15:04:15 -07:00
Michael Schmatz	7f9301e8c6	Setting up read preferences and china specific configuration	2015-03-19 14:18:38 -04:00
Nick Winter	330808f936	Merge branch 'master' into production	2015-03-18 16:21:44 -07:00
Nick Winter	585fa40a8c	Added first draft of campaign info to campaign selector screen.	2015-03-18 16:20:30 -07:00
Nick Winter	103cbe7996	Merge branch 'master' into production	2015-03-16 14:17:22 -07:00
Nick Winter	709c2fc4f1	Added more Artisan permissions for Articles.	2015-03-16 13:54:20 -07:00
Nick Winter	487815b3e6	Merge branch 'master' into production	2015-03-14 11:34:19 -07:00
Nick Winter	ab64a335e4	Another fix for poll handler getting next poll if there are no poll records yet.	2015-03-14 11:30:54 -07:00
Nick Winter	83dcc9ee85	Merge branch 'master' into production	2015-03-14 09:57:54 -07:00
Nick Winter	89bdb3b790	Fixed #2518.	2015-03-14 09:57:31 -07:00
Nick Winter	57e77a0cd7	Upcoming ladder level Zero Sum equalizes all players' heroes and equipment.	2015-03-14 09:39:43 -07:00
Matt Lott	82991f9805	Merge branch 'master' into production	2015-03-13 15:55:32 -07:00
Matt Lott	fde8904fd8	Add backwards compatibility check for Stripe sub search	2015-03-13 15:39:19 -07:00
Matt Lott	af89452b93	Merge branch 'sponsored-subs'	2015-03-13 15:19:20 -07:00
Nick Winter	fa3d2738c4	Merge branch 'master' into production	2015-03-12 11:09:10 -07:00
Nick Winter	be84517010	Enabling another offer.	2015-03-12 11:08:58 -07:00
Nick Winter	a433c30616	Merge branch 'master' into production	2015-03-11 09:01:52 -07:00
Nick Winter	a697b35920	Fixed poll fetching for first poll.	2015-03-11 09:01:40 -07:00
Nick Winter	7d59221b9c	Merge branch 'master' into production	2015-03-10 22:45:03 -07:00
Nick Winter	9c99fc455a	A few poll fixes.	2015-03-10 09:45:21 -07:00
Nick Winter	8c1de9dfa2	Added user index for siterefs.	2015-03-09 17:50:36 -07:00
Nick Winter	497a6c6541	Merge branch 'master' into production	2015-03-09 16:34:37 -07:00
Nick Winter	dc5fb0af14	Sending a couple more offers in the next-steps emails.	2015-03-09 16:32:29 -07:00
Nick Winter	f198f8e35b	Merge branch 'master' into production	2015-03-09 10:11:12 -07:00
Nick Winter	f3e0b9c00c	Poll answers now recordable by non-admins.	2015-03-09 10:11:03 -07:00
Nick Winter	7373965308	Merge branch 'master' into production	2015-03-09 09:31:02 -07:00
Nick Winter	495845a633	Storing certain poll results in User object. Showing a poll once per day.	2015-03-09 09:30:51 -07:00
Nick Winter	e21360127d	Polls!	2015-03-08 16:36:17 -07:00
Nick Winter	2cf23fc481	Merge branch 'master' into production	2015-03-04 17:08:55 -08:00
Nick Winter	1c88881b44	Hooked up a next-steps email to be sent on day two.	2015-03-04 17:08:45 -08:00
Matt Lott	b3655779d1	Merge branch 'master' into production	2015-03-04 15:43:35 -08:00
Matt Lott	cd59b90e37	Add custom payments ... Example: https://codecombat.com/account/invoices?a=21600&d=9%20monthly%20subscrip tions	2015-03-04 15:40:53 -08:00
Nick Winter	687b21620f	Merge branch 'master' into production	2015-03-04 11:29:21 -08:00
Matt Lott	418536ed60	Turn off mailchimp subscribe for unit tests	2015-03-04 05:50:24 -08:00
Michael Schmatz	f024f25235	Add some indexes	2015-03-04 00:04:16 -05:00
Nick Winter	a2cdab8c71	Merge branch 'master' into production	2015-03-03 09:06:49 -08:00
Nick Winter	a2bbc9c893	Actually saving said referrer information.	2015-03-03 09:06:42 -08:00
Michael Schmatz	d7e8e2f729	Merge pull request #2460 from codecombat/master ... Merge into production	2015-03-02 19:22:27 -05:00
Michael Schmatz	d0908f694c	Log app server analytics event to the new analytics server ... I never managed to get the res.close event (responses from the server are 0-length) I feel like this is a bug with Node I should report.	2015-03-02 19:02:28 -05:00
Nick Winter	c309080fca	Merge branch 'master' into production	2015-03-01 21:13:07 -08:00