207 commits

Author	SHA1	Message	Date
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
Nick Winter	6ac0bea5ca	Beefing up contact form data population.	2014-12-19 17:27:58 -08:00
Nick Winter	98ab756835	Merge branch 'master' into production	2014-12-18 22:22:54 -08:00
Nick Winter	0635d1dccf	Fixed typo in contract emails.	2014-12-18 22:22:44 -08:00
Nick Winter	5492e0b62a	Merge branch 'master' into production	2014-12-18 20:39:29 -08:00
Nick Winter	59b433d863	Upgrading contact form context a bit.	2014-12-18 20:39:15 -08:00
Nick Winter	d801ed61ce	Separating contact emails into premium subscriber support and basic general support.	2014-12-18 20:35:14 -08:00
Matt Lott	e573f0344c	Merge branch 'master' into production	2014-12-18 00:21:28 -08:00
Nick Winter	fe0c89e433	Reverting 1167655f and 30ed0a0e to re-enable the analytics log handler.	2014-12-17 21:54:56 -08:00
Nick Winter	2ea47cf83b	Fixed #1952 (unsubscribing from specific ladder update emails).	2014-12-17 19:38:36 -08:00
Matt Lott	8ec583109a	Merge branch 'master' into production	2014-12-17 14:29:17 -08:00
Matt Lott	6ab74f9dab	Disable analytics.users.active	2014-12-17 14:17:50 -08:00
Matt Lott	71e66c4d61	No hipchat for analytics.log.event post errors	2014-12-17 10:57:19 -08:00
Nick Winter	60076d09c1	Merge branch 'master' into production	2014-12-15 10:05:41 -08:00
Nick Winter	9ec4b741c4	Fixed CLA permissions check.	2014-12-15 10:02:05 -08:00
Nick Winter	7fb0784921	Merge branch 'master' into production	2014-12-14 13:37:58 -08:00
Nick Winter	753acb1299	Added 'github' permission type to allow access to CLAs view.	2014-12-14 13:37:43 -08:00
Nick Winter	8172c3273a	Merge branch 'master' into production	2014-12-11 20:17:59 -08:00
Nick Winter	194d3ee647	Worked around unstable Zoho mail dependencies by switching password recovery and contact emails to Sendwithus.	2014-12-11 20:15:24 -08:00
Nick Winter	4522f594d6	Merge branch 'master' into production	2014-12-06 12:05:58 -08:00
Scott Erickson	62cab1e76b	Admins can now give users discounts and free accounts from the MainAdminView view.	2014-12-06 10:05:52 -08:00
Nick Winter	31ffeaf269	Merge branch 'master' into production	2014-12-03 16:37:01 -08:00
Scott Erickson	7210de02e9	Set up stripe to get user emails so receipts can be emailed.	2014-12-03 16:36:03 -08:00
Scott Erickson	cd3bb690f4	Created stripe subscription logic.	2014-12-02 20:02:35 -08:00
Nick Winter	d7700a7154	Merge branch 'master' into production	2014-11-30 14:38:13 -08:00
Michael Schmatz	3cf80c895e	Removed log infos, iPad language selection	2014-11-30 16:19:01 -05:00
Nick Winter	38c092c914	Merge branch 'master' into production	2014-11-29 10:39:11 -08:00
Nick Winter	891b78eb44	Hiding some ThangTypes from view in level editor.	2014-11-29 10:34:04 -08:00
Michael Schmatz	897fe6c63e	Improved error handling	2014-11-28 11:44:03 -05:00
Michael Schmatz	2574549a78	Improved error handling	2014-11-28 11:37:31 -05:00
Nick Winter	98d8a2cfb3	Merge branch 'master' into production	2014-11-25 16:54:36 -08:00
Scott Erickson	790217f227	Tweaked how the I18N editor works to guard against garbage English submissions and make the chosen language more consistent.	2014-11-25 16:22:06 -08:00
Michael Schmatz	2300cab908	Merge pull request #1797 from codecombat/master ... Merge master into production	2014-11-25 10:02:51 -05:00
Nick Winter	16e264788a	Trying to workaround a crash I saw in the logs for GitHub auth.	2014-11-24 14:38:54 -08:00