240 commits

Author	SHA1	Message	Date
Nick Winter	9d0d07df06	Merge branch 'master' into production	2015-04-25 17:38:16 -07:00
Nick Winter	80af32180c	Fixed #1638: detect and automatically report unrecoverable world loading errors, plus adding better instructions for checking dev console. We can't recover yet, but having eyes on it will hopefully give us better visibility on this kind of error.	2015-04-25 17:29:02 -07:00
Nick Winter	c8c11df64e	Merge branch 'master' into production	2015-04-20 11:20:58 -07:00
Nick Winter	dc90481a5c	Fixed #2458, I think.	2015-04-18 19:57:37 -07:00
Nick Winter	ebf87e5a12	Merge branch 'master' into production	2015-04-10 18:07:47 -07:00
Nick Winter	fc43803588	Fixed ladder match links in ladder update emails.	2015-04-10 08:17:51 -07:00
Matt Lott	4da477c72f	Merge branch 'master' into production	2015-04-07 10:06:20 -07:00
Nick Winter	7f41ad6c52	Added OSTraining and Breakout Mentors resources.	2015-04-07 09:25:42 -07:00
Nick Winter	238c36ac74	Merge branch 'master' into production	2015-03-25 16:53:35 -07:00
Nick Winter	7dff105cdf	Insane hackery for #1777 to give us more code editor space, better use of space with tall screens, and scrolling API properties. Watch out for bugs.	2015-03-25 16:47:31 -07:00
Nick Winter	1feba83fed	Merge branch 'master' into production	2015-03-24 18:57:12 -07:00
Nick Winter	a7244e1567	Tweaking offer triggers.	2015-03-24 18:56:32 -07:00
Nick Winter	5bc58ce996	Added MakerSquare email offer. Not emailing subscribers with next-steps offers.	2015-03-24 17:08:50 -07:00
Nick Winter	90bc6fb39e	Merge branch 'master' into production	2015-03-23 16:38:20 -07:00
Nick Winter	eda57e366a	Fix for anonymous user signups.	2015-03-23 16:38:12 -07:00
Nick Winter	b4ea78e5cb	Implementing alternative pricing with Alipay in China to support dedicated China server.	2015-03-23 15:26:44 -07:00
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	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
Matt Lott	82991f9805	Merge branch 'master' into production	2015-03-13 15:55:32 -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	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	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
Nick Winter	6868dafb84	Merge branch 'master' into production	2015-02-25 18:41:56 -08:00
Nick Winter	4e11870be0	Fixed bug with anonymous players' email addresses not making it through.	2015-02-25 17:39:54 -08:00
Nick Winter	96959169ee	Merged db.coffee.	2015-02-18 09:07:49 -08:00
Aman Kumar	f7450c214c	Added user info to db server error	2015-02-17 22:54:49 +05:30
Aman Kumar	c76241be40	Added user info to db error	2015-02-17 14:42:12 +05:30
Nick Winter	7ce0a3dba1	Merge branch 'master' into production	2015-02-05 09:36:18 -08:00
Nick Winter	a189e32948	Refactored sending of HipChat room messages.	2015-02-04 16:17:53 -08:00
Nick Winter	9287df1398	Merge branch 'master' into production	2015-01-27 20:36:53 -08:00
Nick Winter	2e09a94736	Asking for feedback when cancelling subscriptions.	2015-01-26 16:48:32 -08:00
Nick Winter	181842e97b	Merge branch 'master' into production	2015-01-13 13:10:47 -08:00
Scott Erickson	f9a01db985	Added a delete endpoint for files. Fixes #33.	2015-01-12 13:37:01 -08:00
Nick Winter	1b047a7088	Merge branch 'master' into production	2015-01-09 13:48:30 -08:00
Imperadeiro98	68ed142bd6	Update auth.coffee	2015-01-08 19:27:37 +00:00
Nick Winter	3ba746094a	Merge branch 'master' into production	2015-01-07 15:04:54 -08:00
Nick Winter	1455dc0550	Working on repeatable achievement posting. Two tests still fail, though, so it's not there yet.	2015-01-07 12:25:43 -08:00
Nick Winter	a7b39c981b	Merge branch 'master' into production	2014-12-24 11:03:01 -08:00
Nick Winter	d6b5c14123	Give me thine email addresses correctly, dear contact handler.	2014-12-24 11:02:52 -08:00
Nick Winter	4f80d2a977	Merge branch 'master' into production	2014-12-23 08:20:45 -08:00
Nick Winter	759e193f29	Pulling email from user in contact form if they gave an invalid email reply-to.	2014-12-23 08:20:35 -08:00
Nick Winter	20ae570959	Merge branch 'master' into production	2014-12-20 13:43:36 -08:00
Nick Winter	08cb87c84d	Automatically take screenshots when submitting contact form from level view.	2014-12-19 18:37:42 -08:00
Nick Winter	52b2917db5	Merge branch 'master' into production	2014-12-19 17:28:18 -08:00