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

12164 commits

This branch
This branch
All branches
Author SHA1 Message Date
phoenixeliot
d1af5ab77e Merge branch 'master' into production 2016-06-13 12:21:34 -07:00
phoenixeliot
dccb4f3172 Fix Alejandro's name 2016-06-13 12:11:22 -07:00
phoenixeliot
b1bbc0d5de Test client for invite-by-email 2016-06-13 12:08:26 -07:00
Matt Lott
e7d076be65 Update logo 2016-06-11 21:33:15 -07:00
Nick Winter
d25e0a2f55 Merge branch 'master' into production 2016-06-10 16:45:38 -07:00
Ana
9bb1e3946f Update sr.coffee (#3733) 
- fixed some typos and language flow issues
- translated more sections and started courses section
 2016-06-10 20:45:50 +01:00
Imperadeiro98
ccd9bb3eb6 Uncomment and header in es-419.coffee 2016-06-10 11:49:32 +01:00
RUSLAN LÓPEZ CARRO
c1f0e2d5d0 Update es-419.coffee (#3732) 2016-06-10 11:48:50 +01:00
Nick Winter
d2634e63ed Fix #3642: AIs using aiSource now don't need API protection (with new Aether) 2016-06-09 17:59:19 -07:00
Rob
fe07053c39 Merge branch 'master' into production 2016-06-09 17:38:59 -07:00
Rob
41f062fce8 Don't make log collection plural. 2016-06-09 17:38:36 -07:00
Rob
937bec93cd Merge branch 'master' into production 2016-06-09 17:01:16 -07:00
Rob
3a9f0adba8 Switch to using actual node server to receive log events 2016-06-09 17:00:35 -07:00
Nick Winter
bd14e49707 Fix #3701: load data properly for simulation again. 2016-06-09 16:48:18 -07:00
Matt Lott
55bd49fde0 Add course playtimes to student progress CSV 2016-06-09 14:44:47 -07:00
Nick Winter
8203727d60 Fix #3457 2016-06-09 14:35:19 -07:00
Nick Winter
63c0c38c45 Merge branch 'javatlacati-patch-1' 2016-06-09 14:30:20 -07:00
Nick Winter
23090b4198 Merge es-419.coffee 2016-06-09 14:29:57 -07:00
Rob
aa7f2af700 No ads, act two. 2016-06-09 12:13:17 -07:00
Imperadeiro98
ad37fd3460 Fix fr.coffee 2016-06-09 20:10:14 +01:00
dacha76
d5cbe1e11a translated "new_home" section to french. (#3728) 
translated "new_home" section to french.
 2016-06-09 20:07:13 +01:00
Matt Lott
c85a7230a6 Merge branch 'master' into production 2016-06-09 10:48:02 -07:00
Matt Lott
9dbcf27e11 Add classroom Mixpanel logging 
Closes #3720
 2016-06-09 10:46:26 -07:00
duybkict
0c0f075424 #3138 #3488 refactor MyMatchesTabView 2016-06-09 10:31:53 +07:00
duybkict
a4e8cafdb3 #3138 #3488 refactor SimulateTabView 2016-06-09 10:00:47 +07:00
Nick Winter
2c1ed6867d Merge branch 'master' into production 2016-06-08 17:15:00 -07:00
Nick Winter
b0fcddac68 Add game-dev level type (#3725) 
* Initial pass adding new game-dev level type.

* Fix a failing test with updated LevelSystem required properties

* Bring back normal Angel worker timeout times

* Fix another failing LevelSystem test since removing propertyDocumentation
 2016-06-08 16:57:00 -07:00
Scott Erickson
0d5bf6b4de Merge branch 'username-login' 2016-06-08 15:48:46 -07:00
Scott Erickson
c57fd6f460 Do not set campaignIndex for levels except for course campaigns 2016-06-08 15:48:26 -07:00
Matt Lott
546598396d Add Lisa to /about page 2016-06-08 15:46:21 -07:00
Matt Lott
6019beac25 🐛Fix license request email parsing 
Caused by
https://github.com/codecombat/codecombat/commit/a6bb706cf295e2680fe77ff1
3e91d3da59487b53
 2016-06-08 14:53:30 -07:00
phoenixeliot
938be287b3 Merge branch 'master' into production 2016-06-08 14:40:53 -07:00
phoenixeliot
8f20e9f7d1 Fix missing names for Ida/Nando 2016-06-08 14:40:37 -07:00
Scott Erickson
69f3ee3a5b Allow username login, tear out a bunch of related stuff in change 
* Switch from auth.loginUser to User.loginPasswordUser with Promise
* Remove a cascade of unused views that were using auth.loginUser: StudentLogInModal, StudentSignupModal, HourOfCodeView
* Also remove auth.createUser
 2016-06-08 13:55:19 -07:00
Scott Erickson
fe8760b122 Add Travis-Slack integration 2016-06-08 13:54:43 -07:00
Scott Erickson
86699a8510 Merge pull request #3719 from duybkict/refactor-LadderTabView 
#3138 #3488 refactor LadderTabView
 2016-06-08 10:01:37 -07:00
Scott Erickson
2f9f062165 Merge pull request #3718 from duybkict/refactor-LadderPlayModal 
#3138 #3488 refactor LadderPlayModal
 2016-06-08 09:53:59 -07:00
Scott Erickson
6beae97911 Merge pull request #3717 from duybkict/refactor-ContributorClassView 
#3138 refactor contributor views
 2016-06-08 09:43:14 -07:00
Scott Erickson
9a36cf514e Merge pull request #3716 from duybkict/fix-3678-rebase 
Fix #3678 display error on loading resources failed - rebased
 2016-06-08 09:35:31 -07:00
duybkict
23d45ab947 #3138 #3488 refactor LadderTabView 2016-06-08 16:36:01 +07:00
phoenixeliot
f728c1c8a7 Revert using Bluebird instead of Promise polyfill 2016-06-07 11:39:00 -07:00
phoenixeliot
aa443d372f Revert using Bluebird instead of Promise polyfill 2016-06-07 11:38:00 -07:00
Matt Lott
c3f1e6e04c Turn off homepage logged out a/b tests 2016-06-07 05:36:48 -07:00
duybkict
c1f1b4a048 #3138 #3488 refactor LadderPlayModal 2016-06-07 18:05:06 +07:00
duybkict
7e4573f37c #3138 refactor contributor views 2016-06-07 17:09:00 +07:00
duybkict
f439ffddc7 fix issue #3678 2016-06-07 09:42:57 +07:00
phoenixeliot
44ef84adce Revert SendWithUs changes 2016-06-06 16:54:54 -07:00
phoenixeliot
c191f63c15 Revert all of my sendwithus changes 
Revert "Fix more sendwithus things"

This reverts commit 9d4215d99d.

Revert "Fix some missed sendwithus changes"

This reverts commit 08bc32e005.

Revert "Fix email tests"

This reverts commit fcb2ce8504.

Revert "Use SendWithUs versioning"

This reverts commit 81d9e19221.
 2016-06-06 16:54:15 -07:00
phoenixeliot
9d4215d99d Fix more sendwithus things 2016-06-06 16:48:21 -07:00
phoenixeliot
08bc32e005 Fix some missed sendwithus changes 2016-06-06 16:38:20 -07:00