766 commits

Author	SHA1	Message	Date
Nick Winter	76ee449693	Merge branch 'master' into production	2014-12-04 22:22:39 -08:00
Scott Erickson	d0ee8cb7c7	Set up the server to allow admins to assign customers coupons. Fixed up how customers are created/updated by the server to allow setting new payment information rather than forever using the payment info first provided.	2014-12-04 17:41:27 -08:00
Matt Lott	338f1d87ea	Merge branch 'master' into production	2014-12-04 15:24:21 -08:00
Scott Erickson	0edf4e0ca1	Fixed a MailChimp test. Fixed payment and subscription handlers to deny anonymous users. Hid the subscribe button from anonymous users.	2014-12-04 13:07:07 -08:00
Matt Lott	e3abb9ceb3	Capture active user metrics ... Watching for these events: Level completed User registered Playtime of 30s in a level Purchase Payment Subscribe Earned an achievement	2014-12-04 12:57:57 -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	0893784a75	Fixed MailChimp subscription updating from the website.	2014-12-03 15:26:39 -08:00
Scott Erickson	eb98cf4952	Hooked up Level handler to deny creating new LevelSessions when the level requires a subscription and the user doesn't have one.	2014-12-03 13:32:28 -08:00
Nick Winter	50ec896fd8	Added a requiresSubscription property to the levels.	2014-12-03 11:46:03 -08:00
Nick Winter	65dde043c7	SubscribeModal is in.	2014-12-03 09:14:14 -08:00
Scott Erickson	aea1e39b58	Tweaked the subscription handler to act more like the payment handler when a card charge fails. It returns 402.	2014-12-02 20:40:33 -08:00
Scott Erickson	cd3bb690f4	Created stripe subscription logic.	2014-12-02 20:02:35 -08:00
Scott Erickson	40ed4e1056	Merge branch 'master' into production	2014-12-02 13:30:33 -08:00
Scott Erickson	5dcdabfd62	Refactored stripeCustomerID to stripe object in the user object so we can put more stuff in there.	2014-12-02 11:47:15 -08:00
Nick Winter	b49d880fd9	Merge branch 'master' into production	2014-12-01 13:53:40 -08:00
Nick Winter	ffcfec0a6a	Trying to shut the server up about some anonymous user who is simulating.	2014-12-01 13:53:17 -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	2eb8441911	Merge branch 'master' into production	2014-11-29 13:10:48 -08:00
Scott Erickson	3e0394d0d8	Fixed the latest version handler to handle invalid original id inputs.	2014-11-29 11:11:40 -08:00
Nick Winter	528dfaa583	Merge branch 'master' into production	2014-11-29 10:52:59 -08:00
Scott Erickson	1bd70591a0	Added new mongodb versions to be allowed. ... Added error logging for every which reason a user may be unable to pay. Added more info for users when they hit unknown errors.	2014-11-29 10:46:01 -08: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
Nick Winter	d2aabbdacc	A couple workarounds for crashing server tests. Including method in HipChat error messages. Trying to work around undefined ThangType fetch during level loading.	2014-11-29 08:43:40 -08:00
Nick Winter	383f215b36	Merge branch 'master' into production	2014-11-28 19:40:00 -08:00
Scott Erickson	31214e854e	Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways.	2014-11-28 17:49:41 -08:00
Nick Winter	4b45385571	Working on paper dolls.	2014-11-28 12:11:59 -08:00
Michael Schmatz	980b5f7580	Merge branch 'master' into production ... Conflicts: server_setup.coffee	2014-11-28 14:40:07 -05:00
Michael Schmatz	6cb46aafa8	Link to Papertrail logs in error messages	2014-11-28 14:37:55 -05: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
Michael Schmatz	3475770f13	Merge branch 'master' into production	2014-11-28 11:09:07 -05:00
Michael Schmatz	0ac0065753	Fixed payments	2014-11-28 11:07:37 -05:00
Nick Winter	915a3243f5	Added feature image hair and thumb slots to the ThangType.	2014-11-26 16:29:48 -08:00
Nick Winter	53c6da5ef8	Allowing upload of paper doll images for items.	2014-11-26 14:18:17 -08:00
Nick Winter	318b499e3e	Merge branch 'master' into production	2014-11-26 12:57:10 -08:00
Scott Erickson	c4fdcab6fe	The HeroVictoryModal now has the server check for and upsert any missing items, levels and heroes earned.	2014-11-26 12:02:42 -08: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
Nick Winter	ab6251281e	Added a payment-received HipChat notification.	2014-11-25 13:20:09 -08:00
Scott Erickson	8f55b9bc1b	Refactored the AccountSettingsView to be both in the site and in the PlayAccountModal.	2014-11-25 12:43:17 -08:00
Nick Winter	621764aa0c	Merge branch 'master' into production	2014-11-25 09:28:54 -08:00
Nick Winter	98f1eec10c	Upgraded choose hero view for locked heroes. Went back to animated heroes instead of feature images. Removed some server logs.	2014-11-25 09:28:50 -08:00
Michael Schmatz	a3a3aea6aa	Merge branch 'master' into production	2014-11-25 11:21:30 -05:00
Michael Schmatz	2b8006ff83	Fixing more crashing bugs	2014-11-25 11:20:39 -05:00
Michael Schmatz	3ab8620745	Merge pull request #1798 from codecombat/master ... Fixed a few crashing bugs	2014-11-25 10:57:31 -05:00
Michael Schmatz	30e08e2c99	Fixed a few crashing bugs	2014-11-25 10:52:20 -05:00
Michael Schmatz	2300cab908	Merge pull request #1797 from codecombat/master ... Merge master into production	2014-11-25 10:02:51 -05:00