Scott Erickson
|
490ea8d1bc
|
Add state to delighted data if state was populated by nces
|
2016-06-17 13:53:49 -07:00 |
|
Rob
|
b4baad82b0
|
Don't set up the analytics log model in proxy mode.
|
2016-06-17 11:41:43 -07:00 |
|
Scott Erickson
|
8657f97867
|
Switch travis client test progress to dots
|
2016-06-17 10:42:59 -07:00 |
|
Scott Erickson
|
0581ffde82
|
Clean server test logging
|
2016-06-17 10:35:22 -07:00 |
|
Scott Erickson
|
ca83ed05e4
|
Only require user sessions on /db requests that are not GET
|
2016-06-16 16:00:45 -07:00 |
|
Scott Erickson
|
972c632d85
|
Fix fr.coffee indentation
|
2016-06-16 14:32:52 -07:00 |
|
Nick Winter
|
2c33861c64
|
Merge branch 'master' into production
|
2016-06-16 12:57:59 -07:00 |
|
Catsync
|
6901b758e6
|
Update estimated course times (#3738)
* Update time estimates for courses.
* Update coming soon text.
|
2016-06-16 12:56:43 -07:00 |
|
Cat Sync
|
6f86617d9b
|
Merge remote-tracking branch 'codecombat/master'
|
2016-06-16 11:48:17 -07:00 |
|
Scott Erickson
|
57def1fbeb
|
Merge pull request #3727 from duybkict/refactor-MyMatchesTabView
#3138 #3488 refactor MyMatchesTabView
|
2016-06-16 10:41:17 -07:00 |
|
Scott Erickson
|
a4b5e92b06
|
Merge pull request #3726 from duybkict/refactor-SimulateTabView
#3138 #3488 refactor SimulateTabView
|
2016-06-16 10:34:53 -07:00 |
|
Matt Lott
|
40786dbdaa
|
Merge branch 'master' into production
|
2016-06-16 10:22:11 -07:00 |
|
Matt Lott
|
6739353d8e
|
🐛Fix hint intro overview duplicates
|
2016-06-16 10:21:37 -07:00 |
|
Cat Sync
|
eec7f6d697
|
Merge remote-tracking branch 'codecombat/master'
|
2016-06-15 16:26:25 -07:00 |
|
Matt Lott
|
c605586117
|
Merge branch 'master' into production
|
2016-06-15 16:18:56 -07:00 |
|
Scott Erickson
|
86fc4a3846
|
Hints v1
Add per-level tips and tricks, available during gameplay to help unstick players.
Closes #3736
|
2016-06-15 16:12:41 -07:00 |
|
Scott Erickson
|
c8e7b79e5d
|
Make demoEl run _.once
|
2016-06-15 16:09:24 -07:00 |
|
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 |
|