Commit graph

11204 commits

Author SHA1 Message Date
Scott Erickson
3390663486 Fix GuideView to use session.codeLanguage by default 2016-02-19 10:55:42 -08:00
Scott Erickson
cea1a70ab4 Merge branch 'adeeb1-master' 2016-02-19 10:07:52 -08:00
adeeb1
e71a4b71dc Fixed GitHub authentication - #1764 2016-02-19 10:07:05 -08:00
Matt Lott
19d0e67002 Dashboard classroom vs campaign year chart 2016-02-19 09:32:17 -08:00
Matt Lott
8f216a6915 Fix analytics active users script
MAUs were not calculated correctly
Missing log data was not approximated correctly
2016-02-19 09:11:59 -08:00
Matt Lott
ce525e7d99 Add played definition to analytics dashboard 2016-02-18 09:14:36 -08:00
Imperadeiro98
92dc72cce1 Remove name from loadModel 2016-02-18 16:44:40 +00:00
Imperadeiro98
5353dcff3d Merge pull request #3406 from Ikuyadeu/patch-1
Update ja.coffee
2016-02-18 14:53:23 +00:00
Yuki Ueda
f942816188 Update ja.coffee 2016-02-18 21:57:01 +09:00
Matt Lott
1f01b3ffbd Update revenue analytics with payment.prepaidID 2016-02-17 13:01:09 -08:00
Scott Erickson
cf030146e8 Restrict request quote emails
* If logged in => repopulate and lock email (and name if available)
* If logged out => disallow using an email for an existing account and display a validation message + login link
2016-02-17 11:51:26 -08:00
Nick Winter
b5bb662ed2 Add picoCTF problem descriptions to levels; streamline picoCTF flows more 2016-02-17 11:33:56 -08:00
Scott Erickson
0905a378a0 Fix recent scrolling changes for Firefox 2016-02-17 11:21:43 -08:00
Scott Erickson
53eea0c236 Fix navigation from one page to the next
* Reset flying focus so it doesn't lengthen the page
* Scroll to the top of the page when switching views
2016-02-17 11:05:52 -08:00
Scott Erickson
c8551a6382 Make new home page responsive 2016-02-17 11:05:20 -08:00
Matt Lott
cb29d7068b Add prepaids to payments
Closes #3402
2016-02-17 10:08:44 -08:00
Nick Winter
37fbd8ca21 Start to play picoCTF levels as course levels without hero selection 2016-02-17 09:53:45 -08:00
Nick Winter
fe351be32e Start to rework CampaignView when we're in picoCTF mode 2016-02-16 20:39:59 -08:00
Rob
0aa3418e44 Add PicoCTF backend support. 2016-02-16 16:44:35 -08:00
Scott Erickson
c2f02ebbfb Fix scrollToLink, including removing unneeded offset 2016-02-16 10:47:49 -08:00
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
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