codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-11 16:21:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
7618 commits 27 branches 0 tags 134 MiB
Commit graph

944 commits

Author SHA1 Message Date
Nick Winter
43b59c1b44 Merge branch 'master' into production 2014-12-28 17:25:06 -08:00
Nick Winter
1390cbacdc Temporarily reverting 0bdec68 change to PUT for versioned documents. 2014-12-28 17:24:37 -08:00
Nick Winter
8f6114b709 Merge branch 'master' into production 2014-12-28 13:31:36 -08:00
Nick Winter
744d30737e Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents. 2014-12-28 13:25:20 -08:00
Nick Winter
b4341ad46c Merge branch 'feature/campaign-editor' 2014-12-27 11:03:51 -08:00
Michael Schmatz
a3d1e0aaef Merge branch 'master' into production 2014-12-24 16:46:29 -05:00
Michael Schmatz
3d1ee9767f Fix sorting crashing bug 2014-12-24 16:45:34 -05: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
Michael Schmatz
2e9e9ee85c Put limit on things to be sorted 
We might have to alter the queries a bit if we aren't happy with the results
 2014-12-23 20:19:20 -05: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
Scott Erickson
0bdec68cfc Set up a save button. 2014-12-22 16:21:57 -05:00
Scott Erickson
0dd2d9efbd Handled merge conflict. 2014-12-22 12:33:52 -05:00
Nick Winter
69118206ab Merge branch 'master' into production 2014-12-20 20:02:03 -08:00
Nick Winter
e8d185a860 Embedding level completion checklist inside the level editor. 2014-12-20 20:01:07 -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
Scott Erickson
59318b2f78 Merge branch 'master' into feature/campaign-editor 2014-12-19 12:54:11 -05: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
Scott Erickson
b63b4d64da More work on the CampaignEditorView. Data gets saved to models now. 2014-12-17 22:53:04 -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
Michael Schmatz
f5d9550d60 Merge branch 'master' into production 2014-12-17 21:59:43 -05:00
Michael Schmatz
a9265bce42 Disabled achievements plugin 2014-12-17 21:58:32 -05: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
Matt Lott
18f44e1600 Merge branch 'master' into production 2014-12-17 10:09:26 -08:00
Matt Lott
30ed0a0ead Disable analytics.log.event server handler 2014-12-17 09:53:43 -08:00
Matt Lott
3c96569e87 Merge branch 'master' into production 2014-12-16 21:47:25 -08:00
Matt Lott
9baef64dd0 Fix double 403 in Handler.get 2014-12-16 21:45:30 -08:00
Scott Erickson
1cc6a97e43 Added basic campaign view, working on campaign handlers. 2014-12-16 17:46:24 -08:00
Nick Winter
b785640a8a Merge branch 'master' into production 2014-12-15 18:02:40 -08:00
Matt Lott
c76662c967 Log analytics events internally 2014-12-15 11:45:12 -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
f1bc25ba3f Merge branch 'master' into production 2014-12-14 16:01:13 -08:00
Nick Winter
fc4354eb3e Forgotten the locale code for my spammer target. 2014-12-14 16:01:03 -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
ef37d74b4d en-UK and en-AU also require patch approval for translations, can never just save. 2014-12-14 13:27:39 -08:00
Nick Winter
6f515d6694 Merge branch 'master' into production 2014-12-13 09:00:44 -08:00
Nick Winter
3b2bebf427 Ended HoC sale. 2014-12-13 09:00:33 -08:00
Scott Erickson
b0de331a10 Shored up stripe transaction payment defences to try and fix #1906. 2014-12-12 15:27:58 -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
e4e5267c0f Merge branch 'master' into production 2014-12-11 19:07:45 -08:00
Matt Lott
0c81942c71 2nd HoC sub sale 2014-12-11 18:39:03 -08:00
Scott Erickson
0b81796333 Created the Campaign foundation: schema, model, handler. 2014-12-11 11:26:28 -08:00
Matt Lott
cc7b1af415 Merge branch 'master' into production 2014-12-10 16:16:04 -08:00
Matt Lott
d4cfaac7e5 Sub price test 2014-12-10 16:05:55 -08:00
Scott Erickson
02953d0e6c Set up a subscription page with subscription info and the subscribe button, taking that logic out of the payments page. 2014-12-10 13:42:12 -08:00
Matt Lott
8d7c8dc52a Merge branch 'master' into production 2014-12-09 17:33:26 -08:00
Scott Erickson
876a663690 Fixed server tests. 2014-12-09 13:41:44 -08:00
Nick Winter
07fd54bbb3 Merge branch 'master' into production 2014-12-09 06:07:17 -08:00
Nick Winter
a97baa2207 HoC sale. 2014-12-09 06:06:14 -08:00
Nick Winter
96cedec946 Merge branch 'master' into production 2014-12-08 08:20:43 -08:00
Nick Winter
61f63caa59 Trying to fix a server crash I found with bad stripe globals. 2014-12-08 08:09:31 -08:00
Nick Winter
b78ade5f28 Merge branch 'master' into production 2014-12-08 07:08:06 -08:00
Nick Winter
d5f953ae4f Getting rid of indexes on employers and candidates. 2014-12-08 07:07:29 -08:00
Nick Winter
7eaef4fd81 Merge branch 'master' into production 2014-12-06 20:31:34 -08:00
Scott Erickson
aac1aa379e Set up stubs for future subscription sales. 2014-12-06 12:38:06 -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
f52c524388 Merge branch 'master' into production 2014-12-05 17:27:40 -08:00
Scott Erickson
836d2905b9 Users who have paid or otherwise have access to all content are now called 'premium', and user objects on client and server have an isPremium getter which checks all relevant properties. 2014-12-05 17:19:52 -08:00
Scott Erickson
f4e3416918 Set up an endpoint for fetching Stripe info. 2014-12-05 17:19:52 -08:00
Scott Erickson
e8bb5b824d Tweaked the subscription handler to modify the actual target user, not necessarily the user that is making the changes. 2014-12-05 15:49:46 -08:00
Scott Erickson
e03e08692e Merge branch 'master' into production 2014-12-05 14:13:21 -08:00
Scott Erickson
209836c172 Fixed user patching to not also unsubscribe subscribers. 2014-12-05 14:11:38 -08:00
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
Michael Schmatz
d56f594d58 Better error handling 2014-11-24 20:07:29 -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
Nick Winter
38c3ed8856 Merge branch 'master' into production 2014-11-23 20:13:43 -08:00
Matt Lott
c16b0f97bf Update sync PVP to use transpiledCode 2014-11-22 20:48:07 -08:00
Scott Erickson
03705825d9 Made the GET /db/* endpoints generally accessible without needing to have a user object associated with the request. 2014-11-22 18:41:06 -08:00
Nick Winter
472b05a5e0 Merge branch 'master' into production 2014-11-21 13:09:02 -08:00
Scott Erickson
e5b87e5158 Tweaked, re-enabled achievement specs. 2014-11-21 10:59:48 -08:00
Scott Erickson
c77d38d59f Made sure Apple receipts can't be re-used with different accounts. 2014-11-21 10:34:37 -08:00
Nick Winter
527d9355e7 Merge branch 'master' into production 2014-11-21 10:05:01 -08:00
Nick Winter
4de71507a8 Fixed winston require in EarnedAchievement handler. 2014-11-21 10:04:50 -08:00
Nick Winter
66f946a881 Merge branch 'master' into production 2014-11-20 22:17:41 -08:00
Scott Erickson
b86e3c30dc Set up level achievements to be created manually by the client, hopefully making them a bit more stable. 2014-11-20 22:09:54 -08:00
Nick Winter
a15f25e155 Merge branch 'master' into production 2014-11-20 22:02:18 -08:00
Nick Winter
2393165d9a Turned off some completed A/B tests. Fixed an achievement recalculation typo Scott found. 2014-11-20 21:57:47 -08:00
Nick Winter
29cbf16dd7 Merge branch 'master' into production 2014-11-20 19:32:37 -08:00
Michael Schmatz
f84e92595b Changed UDID to identifierForVendor 2014-11-20 20:03:24 -05:00
Scott Erickson
a18537b065 Added the ability to assign a user an iOS UDID, and login with it. 2014-11-20 15:54:15 -08:00
Scott Erickson
fae09aad00 Turned on double optin for MailChimp. 2014-11-20 14:31:50 -08:00
Nick Winter
df51e28a1d Fixed camera zoom killing coordinate hover unnecessarily. 2014-11-20 11:37:10 -08:00
Nick Winter
bfeb1457a1 Merge branch 'master' into production 2014-11-19 18:36:40 -08:00
Scott Erickson
13de055c0b Set up a basic achievements list modal for the world map. 2014-11-19 14:56:40 -08:00
Nick Winter
2574f85f3e Merge branch 'master' into production 2014-11-17 21:30:57 -08:00