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

3073 commits

Author SHA1 Message Date
UltCombo
0ad2d086eb subscribe modal: interpolate feature values for all languages 2016-04-23 22:57:10 -03:00
Matt Lott
93194d4f1e Change top nav Courses link to Students 2016-04-23 16:54:24 -07:00
JurianLock
156f53b0a0 Update nl-NL.coffee 2016-04-22 15:58:03 +02:00
Ana
7fcc5c9ae7 Update sr.coffee 
-Prevedene nove stvari, par grešaka u pisanju ispravljeno
-Sekcija o uplatama je pisana u 2. licu množine (formalno), mada mogu prepraviti na 2. lice jednine, kao i za ostale sekcije što je pisano ranije
 2016-04-22 15:31:03 +02:00
KonstantinLA
eab0712b75 Update ru.coffee 
Translate nav module
 2016-04-22 16:10:18 +03:00
Imperadeiro98
37e4976a0f Merge pull request #3566 from qinwenshi/master 
Add Chinese translation for teachers
 2016-04-22 13:08:11 +01:00
Matt Lott
b5f6fef862 Update /about benefits copy 2016-04-21 20:55:20 -07:00
Matt Lott
4a7518ca6f Add new team members to /about 2016-04-21 20:45:13 -07:00
Wen
d8793a315c Add Chinese translation for teachers 2016-04-22 11:34:13 +08:00
Yuki Ueda
5280470af6 Update ja.coffee 2016-04-21 16:06:30 +09:00
Scott Erickson
a452f1ce47 Update teacher trial request views, some related bug fixes 
* Tweak wording, options
* Instead of storing changes in local storage, warn when users may lose changes by navigating away
* Fix CreateTeacherAccountView so that if you connect to an existing account, the redirect is triggered
* Fix users.coffee weird race condition
 2016-04-20 16:30:11 -07:00
phoenixeliot
e2d08fa7cf Stuff 
Partially fix ActivateLicensesModal.spec

[IN PROGRESS] Don't display deleted users

Move userID to classroom.deletedMembers on user delete (not retroactive)

Fix PDF links for course guides, remove old PDFs from repo

Remove deprecated SalesView

Remove underline for not-yet-linked student names

Only show class select when there's more than one

Ignore case when sorting student names

Use student.broadName instead of name for display and sorting

Fix initial load not showing progress after joining a course (hacky)

Fix text entry for enrollment number input

Fix enrollment statistics

Fix enrollment stats completely (and add back in per-class unenrolled count)

Add deletedMembers to classroom schema

More fixes to enrollment stats (don't count nonmember prepaids)

Don't use 0 as implicit false for openSpots

Update suggested number of credit to buy automatically

Fix classroom edit form ignoring cleared values

Add alert text when more users selected than enrollments available

Alert user when trying to assign course to unenrolled students

Alert user when assigning course to nobody

Add some tests for TeacherClassView bulk assign alerts

Fix TeacherClassView tests failing without demos

Use model/collection.fakeRequests :D

Remove unused comment

Fix handling of improperly sorted deleted users on clientside

Add test for moving deleted users to deletedMembers

Add script for moving all deleted classroom members to classroom.deletedMembers

Completely rewrite tallying up enrollment statistics

Fix some tests to not be dependent on logged-in user

Address PR comments

Fix default number of enrollments to buy

Fix i18n for not enough enrollments

Use custom error message for classroom name length
 2016-04-19 12:32:20 -07:00
Imperadeiro98
d07a3394d1 Update pt-PT.coffee 2016-04-18 19:00:25 +01:00
levrawonline
899422ef7f Update es-419.coffee 2016-04-17 16:17:03 -03:00
Nick Winter
15d762e93e Propagate i18n; remove newlines in en.coffee so that other locale files' line numbers will match 2016-04-16 18:11:22 -07:00
Nick Winter
43a1dcad2b Merge da.coffee 2016-04-16 18:07:39 -07:00
Nick Winter
1ceb7f2573 Merge nl-NL.coffee 2016-04-16 18:06:49 -07:00
cundamic
6885de36fc Update sk.coffee 
subscription
 2016-04-14 06:51:20 +02:00
cundamic
0dc913ba78 Update sk.coffee 
translated 1-447
 2016-04-13 17:59:24 +02:00
phoenixeliot
a524256b5b Add sessionless play for Teachers 2016-04-12 19:34:05 -07:00
Imperadeiro98
7d653bf567 Merge pull request #3532 from Minhir/patch-1 
Update English to Russian translation.
 2016-04-11 18:43:45 +01:00
Imperadeiro98
f3bbafda91 Small fixes to pt-BR.coffee 2016-04-11 18:43:15 +01:00
Imperadeiro98
3859c40f66 Merge pull request #3530 from jozadaquebatista/master 
Update pt-BR.coffee
 2016-04-11 18:39:07 +01:00
Imperadeiro98
1bb9678c05 Merge pull request #3543 from murat-yuksel/patch-1 
Added some TR translations
 2016-04-10 16:16:52 +01:00
Imperadeiro98
c056d97594 Small fixes to sk.coffee 2016-04-10 15:42:45 +01:00
Imperadeiro98
aa46de2b26 Merge pull request #3544 from cundamic/patch-21 
Update sk.coffee
 2016-04-10 15:39:20 +01:00
Imperadeiro98
0af4907f71 Merge pull request #3535 from levlas/patch-1 
Suggestions till line 55
 2016-04-10 15:36:16 +01:00
Imperadeiro98
14a6679ed9 Merge pull request #3531 from informaticienzero/master 
Update fr.coffee
 2016-04-10 15:35:13 +01:00
Imperadeiro98
312cc3ca1c Merge pull request #3527 from rafaelkan/patch-3 
Update es-ES.coffee
 2016-04-10 15:33:19 +01:00
Imperadeiro98
4f1e186cc2 Merge pull request #3525 from LawrenceFebs/patch-1 
Update it.coffee
 2016-04-10 15:32:36 +01:00
cundamic
fe8f081cc4 Update sk.coffee 2016-04-10 12:14:43 +02:00
cundamic
f2440bdbc9 Update sk.coffee 
translated 1-318
 2016-04-10 12:10:57 +02:00
Murat Yüksel
bd4811d7fd Added some TR translations 2016-04-09 17:48:11 +03:00
Levente Laszlo
cf4bdba31d Suggestions till line 55 2016-04-06 11:23:50 +02:00
Matt Lott
265f4a8c37 Update enrollments purchase blurb 2016-04-05 11:55:14 -07:00
Matt Lott
49e7506c62 Add parental leave benefits to /about page 2016-04-05 10:14:54 -07:00
Vladimir Ivakin
6ef5e6742c Update ru translation 2016-04-05 23:05:11 +06:00
Matt Lott
4b1486159c Change teacher account convert terminology to update 2016-04-05 09:16:22 -07:00
Matt Lott
133574356a Update /about page 
Removing sales positions, adding marketing position
Updating benefits list
 2016-04-05 06:29:03 -07:00
informaticienzero
622ff4cea1 Update fr.coffee 
Corrections and typo changes to match French rules.
 2016-04-05 12:13:00 +02:00
phoenixeliot
beb53d9f2f Various fixes and changes to teacher-accounts and teacher-dashboard 2016-04-04 15:42:29 -07:00
Scott Erickson
58a5df7a4f Restrict teacher and student accounts to their respective areas and actions 2016-04-04 15:20:34 -07:00
phoenixeliot
4a72ffc185 Implement all of teacher-dashboard 2016-04-04 15:19:27 -07:00
Scott Erickson
bd3a77da9f Implement teacher accounts 2016-04-04 15:18:06 -07:00
Jozadaque Batista
a202681096 Update pt-BR.coffee 2016-04-04 16:34:02 -03:00
Jozadaque Batista
cfae28fc86 Update pt-BR.coffee 2016-04-04 15:08:00 -03:00
rafaelkan
6834a9069f Update es-ES.coffee 
Traslate: loading_error, concepts and legal
 2016-04-04 16:05:17 +02:00
Imperadeiro98
5e2c726a2b Merge pull request #3506 from rafaelkan/patch-2 
Update es-ES.coffee
 2016-04-03 18:12:56 +01:00
LawrenceFebs
d83395c4d8 Update it.coffee 2016-04-03 11:40:58 +02:00
Yuki Ueda
476b26fca2 Update ja.coffee 2016-04-02 18:14:30 +09:00
Yuki Ueda
08fb5baf17 Update ja.coffee 2016-03-31 18:47:41 +09:00
Rob
e40b952ef2 Do something slightly better for loged in students. 2016-03-29 21:44:59 -07:00
Imperadeiro98
dfdfbf620c Uncomment an header from sk.coffee 2016-03-29 20:24:55 +01:00
Imperadeiro98
322037f47d Merge pull request #3512 from cundamic/patch-20 
Update sk.coffee
 2016-03-29 20:24:12 +01:00
Imperadeiro98
b65e0d5031 Merge pull request #3511 from cundamic/patch-19 
Update sk.coffee
 2016-03-29 20:23:20 +01:00
Keld Ølykke
87b66747e8 Update da.coffee 
Added some glue words to make concatenated sentences flow.
 2016-03-29 01:31:12 +02:00
Keld Ølykke
2163dfa115 Update da.coffee 
Fixed wrong indentation of courses.length.
 2016-03-29 00:56:19 +02:00
Keld Ølykke
fbe1a817a9 Update da.coffee 2016-03-29 00:40:19 +02:00
cundamic
0b22b6aa93 Update sk.coffee 
Translation new_home finished.
 2016-03-28 19:04:32 +02:00
cundamic
45b9395c3d Update sk.coffee 
Translation new_home II
 2016-03-28 11:39:54 +02:00
Imperadeiro98
539d0b01cc Update pt-PT.coffee 2016-03-26 21:38:59 +00:00
cundamic
ba2e92043a Update sk.coffee 
translated new _home 1
 2016-03-26 17:48:44 +01:00
cundamic
85b2d42cc6 Update sk.coffee 
tips translations
 2016-03-26 15:49:04 +01:00
Rob Blanckaert
9da65cdcff New homepage variations. 2016-03-25 17:09:58 -07:00
Nick Winter
914e7eb487 Propagate i18n 2016-03-25 10:54:28 -07:00
rafaelkan
da01d7fdba Update es-ES.coffee 
Traslate
 2016-03-25 01:25:09 +01:00
JurianLock
7b05223037 Update nl-NL.coffee 
Reduced some translations so they fit better in the menu.
 2016-03-24 15:34:15 +01:00
Imperadeiro98
87a30b74af Merge pull request #3500 from Ikuyadeu/patch-1 
Update ja.coffee
 2016-03-24 11:21:23 +00:00
Imperadeiro98
5c8d6cc876 Merge pull request #3498 from sake12/master 
update pl.coffee
 2016-03-24 11:19:15 +00:00
Imperadeiro98
5676c6b2e4 Add i18n to new level loading strings 2016-03-22 12:02:36 +00:00
Yuki Ueda
27f5cb5e45 Update ja.coffee 2016-03-21 20:06:09 +09:00
Matt Lott
2bf028cc4a Update /about page team section 2016-03-20 05:30:52 -07:00
sake12
9a52185e77 Update pl.coffee 2016-03-19 20:13:30 +01:00
Krzysztof Pomarański
1e9f950717 update pl.coffee 2016-03-19 12:25:56 +01:00
Matt Lott
5d71acba05 Replace HipChat with Slack 2016-03-18 17:05:21 -07:00
Nick Winter
dc3ba40a45 One more change from #3483 2016-03-18 11:35:56 -07:00
Nick Winter
c42f2512e9 Merge nl-NL.coffee 2016-03-18 11:35:04 -07:00
Matt Lott
255ebbc048 Ads for free campaign players 
Display leaderboard ads on campaign and play views.
Do no show ads in classroom, picoCTF, or to teachers.
Add no ads blurb to subscription features matrix.
Scale game UI for ads on short screens.

Closes #3491
 2016-03-18 10:29:31 -07:00
Matt Lott
f14575ece6 Update subscribe modal level counts 2016-03-17 17:29:47 -07:00
Imperadeiro98
9a36267ba7 Cleanup i18n in some files 2016-03-16 21:49:19 +00:00
Zeldaretter
d565d5bc0b Update de-DE.coffee 
i added and translated all lines that where missing from the original English en.coffee

I would like to Copy my changes to the Austrian German version, because it is nearly the same and if some Austrian Translator finds an error or a better word than he can edit it, but its like british and american English and both understand each others well and here I think its better to have German than English, what do you think?
 2016-03-16 18:36:53 +01:00
Imperadeiro98
e6b0eb6401 Merge pull request #3492 from JurianLock/patch-7 
Update nl-NL.coffee
 2016-03-16 12:59:22 +00:00
JurianLock
3a46ada802 Update nl-NL.coffee 
Another set of updates.
 2016-03-16 13:02:20 +01:00
Zeldaretter
10dc03bc7e Update de-DE.coffee 
Added some new strings from the English original
 2016-03-16 10:12:35 +01:00
Zeldaretter
0ec23f025c Update de-DE.coffee 
new updated strings, I finished translating. Next I will check if all strings are correct by comparing with the English original because some strings were allready translated and may not fit with the new layout.
Greetings and Thank you for a great game
 2016-03-16 09:09:21 +01:00
Zeldaretter
07f21d44bd Update de-DE.coffee 
New strings translated. Nearly done, till Eastern I will finish this and start comparing with the english strings again.
 2016-03-15 22:01:03 +01:00
Nick Winter
db813bd77e Merge zh-HANS.coffee 2016-03-15 08:47:20 -07:00
Imperadeiro98
c07b100712 Merge pull request #3489 from JurianLock/patch-6 
Update nl-NL.coffee
 2016-03-15 15:32:55 +00:00
Imperadeiro98
e5348e665c Merge pull request #3485 from MatiasOlivera/master 
Update es-419.coffee
 2016-03-15 15:26:45 +00:00
Imperadeiro98
719e45a084 Merge pull request #3481 from Zeldaretter/patch-1 
Patch 1
 2016-03-15 15:23:30 +00:00
JurianLock
c1fb0c53a9 Update nl-NL.coffee 
Another set of updates and tweaks.
 2016-03-15 01:22:02 +01:00
Zeldaretter
d9e271da4a Update de-DE.coffee 
Just did the changes. I don't know if it is good to translate the job benefits, because some of them don't work in Germany and I think if someone wants to work for you they have to at least speak enough English to understand this benefits.
 2016-03-14 07:05:01 +01:00
lazydogP
bdf59fe430 Update zh-HANS.coffee 2016-03-14 13:00:44 +08:00
Matías Olivera
d5b8f5c726 Update teachers_quote 2016-03-13 21:56:06 -03:00
Matías Olivera
147db289fb Update about 2016-03-13 21:06:11 -03:00
Chengxin Ma
d2cefce7da Update zh-HANS.coffee 2016-03-13 22:42:12 +01:00
Chengxin Ma
286b8161ca Update zh-HANS.coffee 2016-03-13 22:37:26 +01:00
Jan van den Berg
e449571139 Update nl-NL.coffee 
Minor language fixes
 2016-03-13 12:11:18 +01:00
Zeldaretter
37944f38d9 Update de-DE.coffee 
typo
 2016-03-12 22:18:31 +01:00
Zeldaretter
c968341cb4 Update de-DE.coffee 
6hours of translating, only some Classroom stuff needs to be translated now.
 2016-03-12 22:15:22 +01:00
yuliang123
1a11ade67b Update zh-HANS.coffee 2016-03-12 21:51:20 +01:00
yuliang123
b48e8eeecf Update zh-HANS.coffee 2016-03-12 21:39:26 +01:00
Nick Winter
96d0f4e7ee Merge nl-NL.coffee 2016-03-12 08:48:51 -08:00
Imperadeiro98
4b96cd272b Merge pull request #3477 from delftswa2016/update-Chinese-translation 
Update zh-HANS.coffee
 2016-03-12 14:12:03 +00:00
Imperadeiro98
7bce51c06b Small fixes to previous merge 2016-03-12 14:11:14 +00:00
Imperadeiro98
546ced6816 Merge pull request #3474 from mqrelly/master 
Update hu.coffee: Translate new home page to Hungarian.
 2016-03-12 14:09:33 +00:00
Imperadeiro98
820aeb0b04 Merge pull request #3467 from delftswa2016/NL-translation 
NL translation
 2016-03-12 14:07:56 +00:00
Imperadeiro98
551ec13743 Rearranged quotation marks in es-419.coffee 2016-03-12 14:02:45 +00:00
Imperadeiro98
d8ffcb355c Merge pull request #3464 from MatiasOlivera/master 
Update es-419.coffee
 2016-03-12 13:59:47 +00:00
Imperadeiro98
200d91a8a6 Merge pull request #3461 from Zeldaretter/patch-1 
Update de-DEcoffee
 2016-03-12 13:58:55 +00:00
Chengxin Ma
db52cd0c83 updated new_home in zh-HANS.coffee 2016-03-12 02:26:42 +01:00
Chengxin Ma
e02083214a updated new_home in zh-HANS.coffee 2016-03-12 02:19:20 +01:00
Matt Lott
3a1627682d Update homepage logged out copy 2016-03-11 15:44:37 -08:00
Szabadkia Márk
ba266eae5c Update hu.coffee: Translate new home page to Hungarian. 
Also fix minor spelling errors.
 2016-03-12 00:14:51 +01:00
JurianLock
1d7d9c76b6 Update nl-NL.coffee 
Another set of updates and tweaks
 2016-03-12 00:00:51 +01:00
Scott Erickson
9d315a4848 Fix "students enrolled" to "students assigned" in TeacherCoursesView 2016-03-11 14:13:44 -08:00
Maikel Langezaal
b4c8948f6e small typo 2016-03-11 19:33:59 +01:00
Matías Olivera
e614e5a76c Update play_level's tips 2016-03-11 14:05:23 -03:00
Martijn Cligge
550cec9cd1 NL. Coffee _ Added more translations 
Added more translations and corrected old ones
 2016-03-11 18:00:13 +01:00
Matías Olivera
d3323fc9c7 Update nav 2016-03-11 13:56:42 -03:00
Matías Olivera
cba4fbcad6 Update new home 2016-03-11 13:54:21 -03:00
Maikel Langezaal
bee812149b Additions to dutch translation 2016-03-11 15:58:40 +01:00
Matt Lott
acba838db4 🐛Request demo Ux bugs 
Only ask about login if not logged in
Add missing set up a class i18n string
 2016-03-10 14:40:16 -08:00
Scott Erickson
ebc98f988f Refactor CreateAccountModal out of AuthModal, add class code to signup 2016-03-10 10:52:11 -08:00
Zeldaretter
5006fa8df3 Update de-DEcoffee 
new translations.
please add me to the diplomatpages if you like my work, that would be a great honour.
Thanks^^
 2016-03-10 16:47:26 +01:00
Imperadeiro98
910953d383 Fix build (part 2) 2016-03-10 14:47:45 +00:00
Imperadeiro98
a0b52aca49 Fix build 2016-03-10 14:37:38 +00:00
Imperadeiro98
60f0522192 Uncomment header in nl-NL.coffee 2016-03-10 14:36:48 +00:00
Imperadeiro98
b9e7417b07 Merge pull request #3460 from JurianLock/patch-4 
Update nl-NL.coffee
 2016-03-10 14:35:45 +00:00
Imperadeiro98
ed926ff799 Merge pull request #3459 from Zeldaretter/patch-3 
Update De-de-coffee
 2016-03-10 14:34:15 +00:00
Imperadeiro98
d3d408c5c6 Merge pull request #3455 from Agalondia/patch-1 
Update id.coffee
 2016-03-10 14:32:37 +00:00
Galandre Athalon
cbf8ebd98c Update id.coffee 
There, i've got rid of the # in the translated bits, and change some things and translated a lot of others :D
 2016-03-10 19:35:22 +08:00
JurianLock
aeec7a8e9c Update nl-NL.coffee 
Another set of tweaks and updates
 2016-03-10 11:37:47 +01:00
Zeldaretter
4d72fbeb63 Update De-de-coffee 
New translations
 2016-03-10 11:33:48 +01:00
Imperadeiro98
84ffdc8df2 Merge pull request #3446 from vellrya/patch-1 
Update ru.coffee
 2016-03-09 20:23:58 +00:00
Agalondia
6fec94ffbd Update id.coffee 
Here's my translation for Indonesian, please consider it guys!
 2016-03-09 22:17:29 +08:00
Chengxin Ma
a8e72aac70 fix Chinese grammar 2016-03-09 11:04:46 +01:00
JurianLock
25f598934d Update nl-NL.coffee 
Few tweaks and some general updates.
 2016-03-08 23:44:08 +01:00
Matt Lott
bce9862be2 Update request demo Ux 
Renaming request quote to request demo
Changing create class wording to set up class
Showing different UI if teacher or not
Adding gameplay screenshots to homepage
Update request demo email

Closes #3449
 2016-03-08 09:30:50 -08:00
Imperadeiro98
86e10d0c34 Fix previous merge 2016-03-07 19:22:52 +00:00
Imperadeiro98
1577dc5708 Merge pull request #3444 from JurianLock/patch-2 
Update nl-NL.coffee
 2016-03-07 19:22:17 +00:00
Nick Winter
78379f2e6a Merge pull request #3440 from Imperadeiro98/master 
Remove i18n from admin pages
 2016-03-07 09:16:07 -08:00
Nick Winter
9dc6a04f5e Fix #3447 2016-03-07 07:02:01 -08:00
vellrya
eb32320b6f Update ru.coffee 2016-03-07 15:25:29 +03:00
JurianLock
b6f1a5046d Update nl-NL.coffee 2016-03-06 23:16:14 +01:00
Imperadeiro98
ba12f0b7f4 Fix previous merge 2016-03-06 21:39:43 +00:00
JurianLock
01d250caf3 Update nl-NL.coffee 2016-03-06 22:30:09 +01:00
sake12
44cf0931c4 Update pl.coffee 2016-03-06 12:10:53 +01:00
Imperadeiro98
773c640ced Fix build 2016-03-05 15:25:12 +00:00
Imperadeiro98
2442115892 Remove i18n from admin pages 2016-03-05 15:08:27 +00:00