codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-30 19:06:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
11875 commits 27 branches 0 tags 134 MiB
Commit graph

3112 commits

Author SHA1 Message Date
Imperadeiro98
fc9974dbe1 Uncomment headers from nl-NL.coffee 2016-04-29 20:50:25 +01:00
Imperadeiro98
909250fec3 Merge pull request #3586 from JurianLock/patch-10 
Update nl-NL.coffee
 2016-04-29 20:48:41 +01:00
Scott Erickson
5884a7ce8d Add changelog link to /teacher/courses 2016-04-29 09:23:57 -07:00
JurianLock
f15509cba1 Update nl-NL.coffee 2016-04-29 11:05:04 +02:00
Imperadeiro98
135f7f05ad Update pt-PT.coffee 2016-04-28 20:30:19 +01:00
Scott Erickson
82675bf05a Add created date to teacher classroom view 2016-04-28 11:28:02 -07:00
Nick Winter
51003d21dd Propagate i18n 2016-04-28 10:09:52 -07:00
Nick Winter
747c5f29f7 Finally figured out how to use i18next interpolation correctly; using it on level counts in SubscribeModal 2016-04-28 10:07:47 -07:00
Nick Winter
d666e4e39c Don't translate 'RetroStyle Games' in most cases 2016-04-28 10:07:47 -07:00
Matt Lott
8deea61be8 Update account restricted copy 2016-04-28 09:42:17 -07:00
Matt Lott
7b88eb0250 Remove Clojure from /about and play modals 2016-04-27 16:15:27 -07:00
Nick Winter
89db933c90 Change wording on enrollment purchase page for larger purchases 2016-04-27 14:17:53 -07:00
Imperadeiro98
9433cefcdc Merge pull request #3579 from i32ropie/master 
Update es-ES.coffee
 2016-04-27 18:21:04 +01:00
Imperadeiro98
404171fd23 Merge pull request #3582 from KonstantinLA/patch-3 
Update ru.coffee
 2016-04-27 18:07:32 +01:00
Imperadeiro98
de23d178c2 Merge pull request #3578 from ana-esova/patch-1 
Update sr.coffee
 2016-04-27 18:04:27 +01:00
Scott Erickson
675e3290ac Lock course content to classrooms 2016-04-27 09:58:04 -07:00
KonstantinLA
17fa7226e5 Fix build error 2016-04-27 16:06:21 +03:00
KonstantinLA
6868f1f7e4 Fix placeholder for the subscribe module 2016-04-27 15:52:59 +03:00
KonstantinLA
8000cdc139 Update ru.coffee 
Added russian translation. 
Some fixes
 2016-04-27 15:34:06 +03:00
phoenixeliot
c9ed76471a Add bad translations to Portuguese for testing purposes 2016-04-26 16:37:47 -07:00
phoenixeliot
7c1059bffa Fix code review feedback 
Fix code review feedback (2)

Fix code review feedback (3)
 2016-04-26 16:37:36 -07:00
phoenixeliot
66f99dd834 Add translation tooltips for code 
Tweak tooltips, add some translation keys

Fixed not showing translations for English-speakers

Remove comment
 2016-04-26 16:37:07 -07:00
phoenixeliot
aa93a3ec6c Translate spell type (function/method/snippet/etc) 2016-04-26 16:37:06 -07:00
Rob
5bd8f7a1cb COPPA tests. 2016-04-26 14:01:03 -07:00
Rob
4183764b61 Add birthday field to user that rejects users under 13 on signup. 2016-04-26 14:00:49 -07:00
Eduardo Roldan
0c49e9d175 Update es-ES.coffee 2016-04-26 14:37:46 +02:00
Scott Erickson
92f58b29b0 Merge branch 'i18n-subscription-modal-interpolate' of https://github.com/UltCombo/codecombat into UltCombo-i18n-subscription-modal-interpolate 2016-04-25 12:28:46 -07:00
Ana
cd9c2dfccb Update sr.coffee 2016-04-24 21:56:46 +02:00
Ana
51a3eee697 Update sr.coffee 
Translated more sections and fixed some previous lines~
 2016-04-24 21:45:09 +02:00
Imperadeiro98
814c78be8b Uncomment headers from sr.coffee 2016-04-24 14:45:08 +01:00
Imperadeiro98
582abb0d87 Merge pull request #3568 from ana-esova/patch-1 
Update sr.coffee
 2016-04-24 14:42:42 +01:00
Imperadeiro98
4fe258fe7f Merge pull request #3576 from KonstantinLA/patch-2 
Update ru.coffee
 2016-04-24 14:41:10 +01:00
Imperadeiro98
b17c0b9785 Merge pull request #3575 from UltCombo/i18n-pt-br-newhome 
i18n pt-BR: add and improve some `new_home` translations
 2016-04-24 14:40:24 +01:00
Imperadeiro98
53f1216878 Merge pull request #3573 from Ikuyadeu/patch-1 
Update ja.coffee
 2016-04-24 14:39:18 +01:00
Imperadeiro98
a5a56f5085 Merge pull request #3569 from JurianLock/patch-9 
Update nl-NL.coffee
 2016-04-24 14:38:25 +01:00
Imperadeiro98
31d42f3132 Merge pull request #3567 from KonstantinLA/patch-1 
Update ru.coffee
 2016-04-24 14:36:58 +01:00
KonstantinLA
a7cb7a6207 Update ru.coffee 
Added russian translation
 2016-04-24 14:13:53 +03:00
UltCombo
fdb8b4ffeb i18n pt-BR: add and improve some new_home translations 2016-04-24 02:41:31 -03:00
Yuki Ueda
25bd614f9d Update ja.coffee 2016-04-24 11:38:23 +09:00
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