Commit graph

12184 commits

Author SHA1 Message Date
Scott Erickson
de138c2581 Disable ModuleLoader debug logs because they get in the way 2016-06-15 16:09:24 -07:00
phoenixeliot
b4f67a71e6 Merge branch 'master' into production 2016-06-15 15:08:55 -07:00
phoenixeliot
e841334c86 Fix join class modal (temporary hack) 2016-06-15 13:28:03 -07:00
phoenixeliot
9239d2a81b Fix text overflowing on teacher dashboard 2016-06-15 13:09:43 -07:00
Nick Winter
109de55185 Stop unprocessing flag events when serializing the flag history so that flag history is properly deterministic again 2016-06-14 18:02:08 -07:00
Matt Lott
409b170891 Update inbound lead assignment splits 2016-06-14 16:44:51 -07:00
phoenixeliot
53aa6652a0 Merge branch 'master' into production 2016-06-14 14:29:19 -07:00
phoenixeliot
749601c9d8 Don't cache classrooms (fetched by memberID) 2016-06-14 14:27:57 -07:00
phoenixeliot
b95a051d63 Merge branch 'master' into production 2016-06-14 13:03:52 -07:00
phoenixeliot
e73a31abe6 Fix loading hero thangs more 2016-06-14 13:03:42 -07:00
phoenixeliot
46abc1899d Merge branch 'master' into production 2016-06-14 12:01:28 -07:00
phoenixeliot
b3f8b79897 Register dependencies for course mode too 2016-06-14 12:01:12 -07:00
phoenixeliot
2dc66f5947 Log some stuff for debugging 2016-06-14 11:54:29 -07:00
Matt Lott
687b2953c2 Merge branch 'master' into production 2016-06-14 10:29:54 -07:00
Matt Lott
ecb5169ca7 Add hintsB to level schema 2016-06-14 10:29:30 -07:00
Diego Toala
6cd1bfac71 Update es-419.coffee (#3734)
I want to contribute translating to Spanish (Latam). This is a test to know I am doing right.
2016-06-14 11:29:25 +01:00
Nick Winter
a96d5df78e Don't protect APIs in game-dev levels 2016-06-13 16:21:22 -07:00
phoenixeliot
4efb1d69dd Merge branch 'master' into production 2016-06-13 14:51:07 -07:00
phoenixeliot
ccf5b449e3 Use classroom.courses.levels instead of campaign.levels 2016-06-13 14:47:10 -07:00
phoenixeliot
98bfcb4c9e Fix footer margin on TeacherClassView 2016-06-13 14:45:24 -07:00
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