Commit graph

11210 commits

Author SHA1 Message Date
Matt Lott
73657d5428 Update analytics dashboard
Splitting out classroom and campaign active users
Adding more detailed active users graphs
Patching up missing analytics log events for 2/2/16-2/9/16
2016-02-16 09:23:42 -08:00
Nick Winter
c7bede92e9 Merge branch 'master' into production 2016-02-16 09:16:43 -08:00
Nick Winter
1f52329c7a Merge pull request #3391 from khoa102/master
new update
2016-02-14 12:03:47 -06:00
Imperadeiro98
60e6d4add3 Merge pull request #3397 from minwook-shin/patch-4
korean translate continue...
2016-02-13 11:51:57 +00:00
minwook shin
a682bfffa2 korean translate continue...
parent = 부모
but korean manner is [Top people]+님(:nim)
so, 부모님=부모(parent)+님(:nim)xk
2016-02-13 11:15:40 +09:00
Tran Anh Khoa
ea6d68ce5b Update vi.coffee 2016-02-12 14:32:02 -06:00
Ihsara
facf5c89d2 Merge pull request #9 from khoa102/Ihsara-patch-1
Update vi.coffee
2016-02-12 22:25:06 +02:00
Ihsara
a008597e35 Update vi.coffee
minor changes
2016-02-12 22:24:45 +02:00
Tran Anh Khoa
16a977103a Update vi.coffee 2016-02-12 10:43:53 -06:00
Ihsara
6105ef7b16 Merge pull request #7 from khoa102/khoa102-patch-1
Update vi.coffee
2016-02-12 18:03:18 +02:00
Tran Anh Khoa
2fbbf33455 Merge pull request #8 from codecombat/master
Update from Original Fork
2016-02-12 09:30:41 -06:00
Imperadeiro98
5468b2776c Merge pull request #3394 from minwook-shin/patch-3
Always korean translate
2016-02-12 13:42:27 +00:00
minwook shin
5b58e58b86 Always korean translate
313 : Are the words taken from the Wizard of Oz ? i dont know munckin. so, i translate munchkin -> 난쟁이(dwarf : short man)
317 : Padawan is (star wars)yoda's Padawan?? i translate padawan -> 파[pa]다[da]완[wan] (I wrote as sound .)
355 : car and carpet... korean naming, car = 차[:cha]. add (카)[car] (I wrote as sound .)
2016-02-12 21:55:32 +09:00
Tran Anh Khoa
e576202132 Update vi.coffee 2016-02-11 21:41:18 -06:00
Matt Lott
410dda11b9 Update average level playtimes script 2016-02-11 15:13:57 -08:00
Scott Erickson
7355c9614e Merge remote-tracking branch 'origin/master' 2016-02-11 12:33:11 -08:00
Scott Erickson
8c2b6868f1 Add script for fixing level session language settings in arena levels for classrooms 2016-02-11 12:32:59 -08:00
Tran Anh Khoa
67abb47abe Update vi.coffee
Fix bug on line 1150: 
Line 1234: edit a few word 
Line 665: thuê bao -> gói đăng ký
2016-02-11 09:08:24 -06:00
Imperadeiro98
6b7337ab3f Merge pull request #3386 from sungame/patch-1
Update sv.coffee
2016-02-11 14:20:27 +00:00
Ihsara
99d7821f61 Update vi.coffee
contributors job description update
2016-02-11 15:18:46 +02:00
Ihsara
895d8f378d Update vi.coffee
contributors update
2016-02-11 13:36:56 +02:00
Ihsara
489a3ccb64 Update vi.coffee
monor changes
2016-02-11 12:21:00 +02:00
Tran Anh Khoa
be7760c45e Merge pull request #6 from codecombat/master
Update from Original
2016-02-10 19:57:41 -06:00
Tran Anh Khoa
27a48616f7 Update vi.coffee 2016-02-10 17:58:12 -06:00
Tran Anh Khoa
8c86e8be24 Merge pull request #5 from khoa102/Ihsara-patch-1.0viTrans
Update vi.coffee
2016-02-10 16:53:10 -06:00
Nick Winter
6800ea2ff7 Add picoCTFProblem field to levels 2016-02-10 14:16:54 -08:00
Ihsara
5079413059 Merge pull request #4 from khoa102/khoa102-patch-1-viTranslation
Update vi.coffee
2016-02-11 00:02:05 +02:00
Ihsara
506b6996c0 Update vi.coffee
minor
2016-02-10 23:58:38 +02:00
Tran Anh Khoa
f50371e14d Update vi.coffee
Change a few tip into Vietnamese
2016-02-10 15:41:32 -06:00
Tran Anh Khoa
7ed371520f Merge pull request #3 from khoa102/Ihsara-patch-1.0viTrans
Ihsara patch 1.0vi trans
2016-02-10 15:21:47 -06:00
Ihsara
35a9bb96a7 Update vi.coffee 2016-02-10 23:11:42 +02:00
Ihsara
94df2da536 Merge pull request #2 from khoa102/khoa102-patch-1-viTranslation
Update vi.coffee
2016-02-10 21:33:00 +02:00
Tran Anh Khoa
60796ca83f Update vi.coffee 2016-02-10 13:30:27 -06:00
Ihsara
f54619607a Update vi.coffee 2016-02-10 21:25:35 +02:00
Tran Anh Khoa
83fe7a9125 Merge pull request #1 from khoa102/khoa102-patch-1-viTranslation
Update vi.coffee
2016-02-10 11:23:50 -06:00
Tran Anh Khoa
5d0235828b Update vi.coffee 2016-02-10 11:04:05 -06:00
Tran Anh Khoa
e2abbc317a Update vi.coffee 2016-02-10 10:53:44 -06:00
Matt Lott
61d2ce3dc5 Add index for analytics server log collection
Created on live analytics server as well.
2016-02-09 16:50:55 -08:00
Matt Lott
06436a4bb7 Add levelID property to show subscription modal events
Allows us to consolidate analytics collection indexes and code someday.
2016-02-09 16:50:55 -08:00
Scott Erickson
d0185cc2cd Fix level session creation to use classroom language setting for course-ladder levels 2016-02-09 10:15:26 -08:00
Josh Callebaut
7db678e63f Merge pull request #3380 from Zerrien/editorChanges
Style fixes and fixes level submission emails
2016-02-09 09:42:05 -08:00
Josh Callebaut
99955aa034 Corrects artisan guide modal subdomain 2016-02-09 09:37:09 -08:00
Nick Winter
1cb8ecf213 Merge branch 'master' into production 2016-02-08 14:45:02 -08:00
Nick Winter
0ef29ddb95 Restrict who counts as a teacher in analytics 2016-02-08 14:44:38 -08:00
Nick Winter
40d7c53cd0 Fix 435d5bb6 2016-02-08 14:34:29 -08:00
Nick Winter
435d5bb6d2 Improve getHomePageGroup and narrow to two variants 2016-02-08 14:20:30 -08:00
Scott Erickson
bb38c58903 Properly fix duplicate course instances
* Add script to merge existing course instances
* Have client only send one course instance creation
* Have server return existing course instance if one for the given classroom/course exists
* Remove bandaid code from ClassroomView
2016-02-08 12:48:29 -08:00
Robin Yang
3acb2a4c7a Add View Classes link to Request Demo area 2016-02-08 10:30:59 -08:00
Matt Lott
bd9ca8ee5f Add enrollments graph to analytics dashboard 2016-02-06 14:02:44 -08:00
sungame
9cbb5ad924 Update sv.coffee
Translated some english to swedish
2016-02-06 17:06:27 +01:00