codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-30 19:06:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
11991 commits 27 branches 0 tags 134 MiB
Commit graph

343 commits

Author SHA1 Message Date
Scott Erickson
ebc98f988f Refactor CreateAccountModal out of AuthModal, add class code to signup 2016-03-10 10:52:11 -08:00
Scott Erickson
a2249f8df1 Add return-to-admin (turn off espionage mode) 2016-03-04 10:43:17 -08:00
Scott Erickson
7fb08f343a Refactor /db/article to use generators 2016-02-22 16:03:21 -08:00
adeeb1
e71a4b71dc Fixed GitHub authentication - #1764 2016-02-19 10:07:05 -08:00
Rob
0aa3418e44 Add PicoCTF backend support. 2016-02-16 16:44:35 -08:00
Matt Lott
9d1213bdf9 Update recovery password email 
Closes #3332
 2016-01-18 12:46:18 -08:00
Nick Winter
67f7ce1e0d Add Brazil coupon test. Generalize prices in subscription test a bit more. Handle brazil_basic_subscription product in one more place. 2016-01-12 12:25:13 -08:00
Nick Winter
e872ead632 Implement Brazil coupon 2016-01-11 09:52:46 -08:00
Rob Blanckaert
0fe700b6bf Add healthcheck route 2015-12-29 00:03:43 -05:00
Nick Winter
187a6f87a9 Include course info in contact message session links 2015-12-28 08:15:48 -08:00
Rob
846fb987d2 Merge commit '129d3b793d97ea32e6f42b4ca1f33bb0860157e0' into production 2015-12-16 16:46:00 -08:00
Scott Erickson
a28e7bde2c Update tests for db products, some cleanup 2015-12-16 16:39:44 -08:00
Scott Erickson
7c516c4d9f Move product information to the db 2015-12-14 11:10:50 -08:00
Nick Winter
77a09c86e0 Merge branch 'master' into production 2015-12-10 09:06:58 -08:00
Scott Erickson
23e3821e24 Switch from jasmine-node to jasmine, run server tests on a single process 
This collapses the difference between master and single-process-server-tests, to
remove some larger fixtures files that were in that feature branch.
 2015-12-09 14:27:10 -08:00
Matt Lott
ccbb7c6317 Merge branch 'master' into production 2015-12-04 09:28:52 -08:00
Nick Winter
055a6f7eeb Update next steps email 2015-12-03 12:25:59 -08:00
Nick Winter
9ab2ccd905 Merge branch 'master' into production 2015-11-12 15:36:26 -08:00
Rob
836a01d1a8 Pull out schema fetching, as some times we fetch schemas when we don't actually have a handler for the type. 2015-11-12 15:01:33 -05:00
Rob
234d1b5950 Bind express /db roots one at a time. 
Don't forget about the module root!

Route maps better.
 2015-11-12 14:43:50 -05:00
Nick Winter
44fb30b81e Merge branch 'master' into production 2015-11-12 10:25:51 -08:00
Nick Winter
29892a9619 Add user country to contact messages 
https://app.asana.com/0/54275583589675/64698696631078/f
 2015-11-11 15:43:25 -08:00
Nick Winter
b51a933a11 Merge branch 'master' into production 2015-10-09 08:05:51 -07:00
Nick Winter
5dde55c1f3 Add premium server recognition for Brazil 2015-10-09 08:05:34 -07:00
Matt Lott
e37c5645ef Merge branch 'master' into production 2015-09-25 15:23:56 -07:00
Matt Lott
928f72e2cf Merge branch 'prepaid-v2' into master 2015-09-25 10:28:27 -07:00
Nick Winter
b06b7b779c Merge branch 'master' into production 2015-09-21 12:41:24 -07:00
Nick Winter
b4f500333f Assign pt-BR or zh-HANS for those domains 2015-09-18 08:38:12 -07:00
Nick Winter
f34dd7c70e Merge branch 'master' into production 2015-08-19 15:35:30 -07:00
Nick Winter
f757f220be Refactored scoring.coffee into separate files per route plus a scoringUtils file, and cleaned up a few of the verbose methods. 2015-08-13 11:17:38 -07:00
Nick Winter
d101a427ba Merge branch 'master' into production 2015-08-08 12:26:33 -07:00
Nick Winter
cd0c252b14 Disabled some logging now that chinaVersion appears to be working. 2015-08-08 12:26:20 -07:00
Nick Winter
721ae833e9 Merge branch 'master' into production 2015-07-31 14:42:08 -07:00
Nick Winter
fc0a6513f3 Fixing some bugs in the geoip and language detection stuff. 2015-07-31 14:32:32 -07:00
Nick Winter
d07b087c7b Merge branch 'master' into production 2015-07-27 11:35:35 -07:00
Nick Winter
e43addf55b Debugging chinaVersion inconsistencies. 2015-07-27 11:35:20 -07:00
Nick Winter
85db686e74 Merge branch 'master' into production 2015-07-24 17:38:39 -07:00
Nick Winter
899aae5798 Consolidated extra resources. 2015-07-10 14:20:25 -07:00
Nick Winter
40e1e6b2ac Merge branch 'master' into production 2015-06-30 11:28:11 -07:00
Nick Winter
270340a79f Removed Learnable. 2015-06-24 09:18:13 -07:00
Nick Winter
bc8e0945a1 Merge branch 'master' into production 2015-06-17 18:17:22 -07:00
Matt Lott
5c240d89cd Cancel recipient subscriptions immediately 2015-06-17 16:35:30 -07:00
Matt Lott
b27a4539f1 Merge branch 'master' into production 2015-06-05 10:38:20 -07:00
Imperadeiro98
a85e6fb695 Removed unnecessary full stop 2015-06-02 21:34:01 +01:00
Matt Lott
9828bd5d1d Sponsored sub cleanup on unsubscribe 
Sponsored subscriptions can be partially set up when the incremental
subscription charge fails.  This cleans up the sponsored subscriptions
when one of the recipient subscriptions is cancelled.

Related to #2786
 2015-05-28 16:56:13 -07:00
Nick Winter
5c70321741 Merge branch 'master' into production 2015-05-25 14:05:19 -07:00
Nick Winter
bb17621b47 Don't let the server die when a sponsored subscription's sponsor can't be found. 2015-05-25 14:03:07 -07:00
Nick Winter
28b44f9535 Merge branch 'master' into production 2015-05-25 09:58:39 -07:00
Nick Winter
bebe2dde21 Adding a log to check out what's going on with updating of sponsored subscriptions. 2015-05-25 09:58:25 -07:00
Matt Lott
627884a608 Merge branch 'master' into production 2015-05-12 15:25:34 -07:00
Nick Winter
b7d1ab2b01 Not sending HipChat messages for level load errors. Not sending level load errors for level editor loads. Not sending more than one level load error report per session. 2015-05-11 18:53:42 -07:00
Matt Lott
d016f7d791 Merge branch 'master' into production 2015-04-28 10:32:50 -07:00
Nick Winter
a4964ea36e Reduced transactional email sends a bit. 2015-04-27 15:06:26 -07:00
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