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

7299 commits

Author SHA1 Message Date
Imperadeiro98
13f30ca16a Uncommented strings from last merge 2015-10-18 11:23:42 +01:00
snarkota
23670b9f25 Update lt.coffee 
First lines of lithuanian translation
 2015-10-17 21:09:50 +03:00
Nick Winter
5f8ab8a212 Added support for test campaigns that don't save their levels/achievements 2015-10-16 16:06:53 -07:00
Sam Soffes
d2052980c4 Send sign out message directly 2015-10-16 15:02:33 -07:00
Nick Winter
d5288a254b Remove Ace of Coders tournament blurb from home page 2015-10-16 14:55:58 -07:00
Sam Soffes
59f987e105 Check for new iPad User-Agent 2015-10-16 14:42:25 -07:00
Imperadeiro98
3d1e5f1e34 i18n account dropdown 'Prepaid Codes' 2015-10-15 21:41:47 +01:00
RUSLAN LÓPEZ CARRO
bf8da65060 Update es-419.coffee 2015-10-15 12:48:53 -05:00
Imperadeiro98
63d7df538c Fixed previous merge 2015-10-15 15:21:10 +01:00
Imperadeiro98
f72f786803 Merge pull request #3116 from Fokusnica/master 
changed and added some ru and uk locales
 2015-10-15 15:18:58 +01:00
Derevianko Liubov
58ba08ddb7 changed and added some ru and uk locales 2015-10-15 17:10:12 +03:00
Nick Winter
e15b30893f Note tournament end, undo tournament simulation bias 2015-10-15 06:32:52 -07:00
Scott Erickson
844bc942b3 Fix #2785 2015-10-14 16:01:09 -07:00
Scott Erickson
cbf6032c68 Merge branch 'origin/spritesheets' 2015-10-14 15:03:34 -07:00
Scott Erickson
1f00f5b4b9 Remove vestigial function argument 2015-10-14 15:00:57 -07:00
Scott Erickson
b77626b8ee Minor fixes 
Making sure LayerAdapter doesn't wait for ThangType to load the image more than once.
LayerAdapter skips rendering if there's a prerendered sprite sheet whose image is not loaded.
 2015-10-14 14:48:43 -07:00
Scott Erickson
305cffb5ea Finish hooking up prerendered spritesheets with LayerAdapter 2015-10-14 14:33:26 -07:00
Imperadeiro98
a4d8aec2a7 Added i18n to contributor signup 2015-10-14 21:06:23 +01:00
Scott Erickson
1085731fdd Fix colorConfig prerendered sprite sheet data, comparison 2015-10-14 10:41:10 -07:00
Scott Erickson
39bddb889e Have LayerAdapter use prerendered spritesheets (unfinished) 2015-10-13 16:43:56 -07:00
RUSLAN LÓPEZ CARRO
8e9b46b73c Update es-419.coffee 2015-10-13 18:08:44 -05:00
Nick Winter
74763f0614 Fix experience/gems not showing in HeroVictoryModal 2015-10-13 13:44:25 -07:00
Imperadeiro98
9184566d67 Update pt-PT and standardize new tip 2015-10-13 21:07:21 +01:00
Nick Winter
8209c4a0c7 Propagate i18n 2015-10-13 12:32:51 -07:00
Nick Winter
2336668b09 Actually commit my ru.coffee merge 2015-10-13 12:32:14 -07:00
Scott Erickson
3fc7b71f7a Remove log 2015-10-13 12:31:28 -07:00
Scott Erickson
74a7b53498 Remove vestigial test code 2015-10-13 12:30:18 -07:00
Nick Winter
537ede7740 Merge pull request #3108 from Imperadeiro98/i18n-and-cleanups 
Added i18n to some strings
 2015-10-13 12:27:58 -07:00
Nick Winter
28530f44e6 Merge ru.coffee and uk.coffee 2015-10-13 12:26:28 -07:00
Nick Winter
ac750456b7 Merge ru.coffee and uk.coffee 2015-10-13 12:25:23 -07:00
Nick Winter
0c7169f5c0 Merge pull request #3088 from javatlacati/patch-1 
Update level_loading.jade
 2015-10-13 12:21:19 -07:00
Nick Winter
7584872c9f Fix #3106 introduced by b38a6c50 2015-10-13 08:22:13 -07:00
Imperadeiro98
20371fa146 Indentation re-fix 2015-10-13 16:14:43 +01:00
Nick Winter
d776809e1c Update Hour of Code student flow and tracking, remove signup requirement 2015-10-13 08:12:07 -07:00
Imperadeiro98
2b8856aead Fixed indentation 2015-10-13 16:08:20 +01:00
Imperadeiro98
fbfb80d4bf Added i18n to some strings 2015-10-13 16:05:47 +01:00
Imperadeiro98
c969768800 Merge pull request #3104 from tufik000/patch-2 
Link to Ace of Coders
 2015-10-13 14:58:22 +01:00
Matt Lott
eda10a55ec Update /courses?_ppc= logged out instructions 2015-10-12 21:13:03 -07:00
Scott Erickson
66650452b2 Merge remote-tracking branch 'origin/master' 2015-10-12 16:47:59 -07:00
Scott Erickson
919e0605e9 Add spriteSheets to ThangType, export modal to Thang Editor 
Units can be exported as rastered sprite sheets. This is the first part of the project,
the second part will be having the game use them.
 2015-10-12 16:47:48 -07:00
Scott Erickson
b38a6c5060 Pass all arguments from constructor to initialize in CoreViews, add lodash to default view context 2015-10-12 16:46:30 -07:00
Matt Lott
e1e2be574c Add teacher HoC instructions to /courses 2015-10-12 16:43:46 -07:00
Matt Lott
2aad347166 Add HoC blurb to top of /teachers pages 
Replacing courses beta testing blurb.
 2015-10-12 16:38:28 -07:00
Matt Lott
708f78153b Route /hoc to courses 
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
 2015-10-12 16:25:23 -07:00
Imperadeiro98
56c4c5a1b3 Merge pull request #3105 from AkaKaras/translation 
Translation
 2015-10-12 22:37:35 +01:00
AkaKaras
1a3ab303be zh-hant latest translation 
finally finished the translation, proud of myself (●—●)  b
 2015-10-12 16:54:14 -04:00
tufik000
00170d6821 Link to Ace of Coders 
Changed "torneir" to "torneio" and  "Era dos Programadores" to "Ás dos Programadores"
 2015-10-11 23:02:20 -03:00
Derevianko Liubov
9312d8ad84 added some ru and uk locales 2015-10-11 23:13:07 +03:00
Derevianko Liubov
82c23183c8 added some ru and uk locales 2015-10-11 23:11:20 +03:00
Imperadeiro98
cac0739084 Merge pull request #3101 from HelloSeaNation/patch-2 
Fix another typo
 2015-10-11 20:01:57 +01:00
AkaKaras
3325b91b5a Merge remote-tracking branch 'codecombat/master' into translation 
Conflicts:
	app/locale/zh-HANT.coffee
 2015-10-11 09:15:45 -04:00
AkaKaras
f6217a5626 zh-hant 
translation
 2015-10-11 09:15:28 -04:00
HelloSeaNation
e75413fbe2 Fix another typo 2015-10-11 00:56:37 +13:00
HelloSeaNation
727dce6f2c Fix typo 2015-10-11 00:54:59 +13:00
Tery Lim
0b9e78e2b8 Some zh-HANS translations 
- Translate `prepaid`
- Change `codecombat` => `CodeCombat`
 2015-10-10 22:38:21 +13:00
Tery Lim
124b61a70c Update harry's tips 
`Yer a Wizard,`
 2015-10-10 21:42:02 +13:00
Matt Lott
9ae463ed24 Remove perf killing 'add' event handler from /account/prepaid 2015-10-09 16:03:22 -07:00
Matt Lott
8fce82ce72 Update trial requests approval page query to grab latest 
Used to be limited to first 2000 requests, which was hit on 10/7/15.
 2015-10-09 14:26:04 -07:00
Scott Erickson
2a739ea765 Remove placeholder text in invite email box in course details page 
Already duplicated it outside of the textbox, so it'd be visible even after an email had been entered. This is just removing the old placement.
 2015-10-09 13:45:33 -07:00
Matt Lott
0cb30d9500 Prompt for login in /courses redeem code dialog 2015-10-09 09:32:46 -07:00
Matt Lott
1bd5078ecf 🐛Sort course details nameless members 2015-10-09 09:27:30 -07:00
Imperadeiro98
a74a09a532 Added change to a string 2015-10-09 16:37:19 +01:00
Imperadeiro98
50961e2c68 Update pt-PT.coffee 2015-10-09 16:31:19 +01:00
Nick Winter
5dde55c1f3 Add premium server recognition for Brazil 2015-10-09 08:05:34 -07:00
RUSLAN LÓPEZ CARRO
dcab1eecc0 Update en.coffee 2015-10-09 09:39:15 -05:00
RUSLAN LÓPEZ CARRO
5ff287a511 Update level_loading.jade 2015-10-09 09:35:30 -05:00
Nick Winter
0d6f84cab6 Merginate uk.coffee 2015-10-09 06:08:36 -07:00
Imperadeiro98
442f9d2265 Merge pull request #3092 from kumabotz/patch-2 
Translate careers
 2015-10-09 12:32:54 +01:00
Imperadeiro98
20cd6643c8 Merge pull request #3091 from kumabotz/patch-1 
Update to zh-HANS period ( 。)
 2015-10-09 12:32:18 +01:00
Derevianko Liubov
cf7952149d add some uk locales 2015-10-09 11:06:09 +03:00
Nick Winter
a34e4b3afd Merge pull request #3084 from Imperadeiro98/clean-up 
Cleaned up a couple of files
 2015-10-08 16:25:50 -07:00
Tery Lim
fb29cd1950 Translate careers 2015-10-09 12:03:46 +13:00
Tery Lim
4a26afd9b2 Update to zh-HANS period ( 。) 2015-10-09 11:11:51 +13:00
RUSLAN LÓPEZ CARRO
721b2c024e Update es-419.coffee 2015-10-08 16:35:21 -05:00
Matt Lott
99c20b88fa Don't show seat count when enrolling in free courses 2015-10-08 12:27:53 -07:00
Matt Lott
171678caad Add try out courses blurb to top of /teachers page 2015-10-08 11:51:00 -07:00
RUSLAN LÓPEZ CARRO
853d08b71e Update es-419.coffee 2015-10-08 11:44:13 -05:00
Matt Lott
9e8294fae8 Comment out courses teacher survey UI 
The teacher survey infrastructure does not support courses yet.
 2015-10-08 09:40:40 -07:00
RUSLAN LÓPEZ CARRO
1f1d74fb3b Update level_loading.jade 
How about adding these two quotes? :D
 2015-10-08 11:36:19 -05:00
Nick Winter
7e8b6589d5 Update HipChat links 2015-10-08 06:14:36 -07:00
Matt Lott
a6f4085b13 Update course details progress colors 
Only show not started key when expanded progress.
 2015-10-08 06:10:12 -07:00
Matt Lott
3642ebd58c 🐛Fix course details playtime stats 2015-10-08 06:10:12 -07:00
Matt Lott
1c1a5d4295 /courses student mode when _ppc present 2015-10-08 06:10:12 -07:00
TJ Ledwith
a87ec2bd81 Added a few names. 
Added a few names.
 2015-10-08 07:43:48 -04:00
Matt Lott
a6e3110549 Update course details completed level/concept to light blue 2015-10-07 17:30:16 -07:00
Matt Lott
c3af5324d5 🐛Fix course details average playtime calc 2015-10-07 17:14:56 -07:00
Matt Lott
2767bbb639 Skip seat count selection for free courses 
Default to 9999 instead.
 2015-10-07 17:08:22 -07:00
Scott Erickson
50f7391e76 Remove programming language and progress class settings 2015-10-07 16:31:19 -07:00
Scott Erickson
76422b3585 Put free teacher evaluation blurb in /courses/enroll on /courses too 2015-10-07 16:23:35 -07:00
Matt Lott
3292f13bc3 Ensure students play course levels in order 2015-10-07 15:33:52 -07:00
Matt Lott
bfacbf8add Course details page defaults to levels tab for students 2015-10-07 15:18:09 -07:00
Matt Lott
440bf9c6e0 /courses?_ppc=blah logged out message 
Also trim /courses prepaid code input.
 2015-10-07 14:56:10 -07:00
Matt Lott
7390f2d1e4 Separate URLs for /courses/students and /courses/teachers 2015-10-07 14:37:41 -07:00
Nick Winter
d651380040 Fix merge conflicts in es-419 2015-10-07 13:24:19 -07:00
Jhoon Saravia
beb8a425f0 Translated new sections and updated other translations 2015-10-07 10:54:49 -05:00
Scott Erickson
2d2f4814f4 Add course membership required error to LevelLoadingView 2015-10-06 12:48:58 -07:00
Matt Lott
75b9cb50d9 Add /courses prepaid code query var 
Update invite students link to go to /courses
 2015-10-06 12:30:22 -07:00
Matt Lott
9c7345fed0 Redeem course prepaid code on /courses page 
Completes #54270566052118
 2015-10-06 11:20:57 -07:00
Scott Erickson
ee138660da Tweak level schema to get WebStorm to stop thinking it's bad syntax 2015-10-06 11:06:41 -07:00
Nick Winter
e0918ec631 Added mountain -> glacier completion link 2015-10-05 16:19:43 -07:00
Scott Erickson
3a90356f59 Add class invite system 2015-10-05 16:01:32 -07:00
Scott Erickson
212ee8a65a Add invite link and capacity info to CourseDetailsView 2015-10-05 16:01:32 -07:00
Nick Winter
d200ac4a32 Fix #2926: handle missing sub-code/spoken-languages in docs 2015-10-05 15:32:02 -07:00
Imperadeiro98
7949e4fbab Cleaned up a couple of files 
Removed some unused strings, an unnecessary style and an event
 2015-10-05 22:30:02 +01:00
tieskedh
6a34e5b813 Update nl-NL.coffee 2015-10-04 15:45:31 +02:00
Imperadeiro98
403cfe2f53 Fixed previous merge 2015-10-03 19:58:12 +01:00
Imperadeiro98
43476ed87f Merge pull request #3082 from etem/master 
Updated Bulgarian translation
 2015-10-03 19:55:59 +01:00
Etem Hyusnev
42056fafdf Translated action_cooldown 2015-10-03 17:05:05 +03:00
Etem Hyusnev
07a0fbf109 Updated Bulgarian translation 2015-10-03 17:01:22 +03:00
Imperadeiro98
a61655f6b8 Uncommented an header 2015-10-02 20:43:30 +01:00
tieskedh
122c9c2d4f added some dutch translations 2015-10-02 18:57:53 +02:00
Matt Lott
5095eac4ac Purchase prepaid on course instance creation 
Updating purchase prepaid API to support courses.
Refactoring the prepaid server code.

Completes #54270567235517
 2015-10-01 15:23:20 -07:00
Nick Winter
079e3a59f5 Update iPad app detection for iOS 9 2015-10-01 09:23:18 -07:00
Imperadeiro98
f3e791bcbd Update pt-PT.coffee 2015-09-30 20:24:28 +01:00
Imperadeiro98
0a658aa1c0 Merge pull request #3079 from javatlacati/patch-2 
Update es-419.coffee
 2015-09-30 19:41:11 +01:00
Imperadeiro98
3960c0911f Uncommented an header 2015-09-30 19:40:57 +01:00
RUSLAN LÓPEZ CARRO
2b9dbeafbf Update es-419.coffee 2015-09-30 12:02:30 -05:00
RUSLAN LÓPEZ CARRO
c466c80bf5 Update es-ES.coffee 
A translation for Thang has been proposed.
 2015-09-30 11:39:20 -05:00
Imperadeiro98
4f5f2c72c7 Uncommented some headers from nl-NL.coffee 2015-09-30 14:59:31 +01:00
Imperadeiro98
5c68bd6a10 Merge pull request #3076 from tieskedh/patch-1 
Update nl-NL.coffee
 2015-09-30 14:54:32 +01:00
RUSLAN LÓPEZ CARRO
0bb6b0d0dc Update es-419.coffee 
Finished translation?!!! :D
 2015-09-29 18:06:45 -05:00
tieskedh
dfdc601af8 Update nl-NL.coffee 
added new translations
 2015-09-30 00:58:59 +02:00
Imperadeiro98
42f6e5d151 Merge pull request #3075 from javatlacati/patch-3 
Update fr.coffee
 2015-09-29 20:13:36 +01:00
Imperadeiro98
b6753293a5 Uncommented an header from it.coffee 2015-09-29 20:12:22 +01:00
Imperadeiro98
71632554db Merge pull request #3074 from javatlacati/patch-2 
Update it.coffee
 2015-09-29 20:11:26 +01:00
RUSLAN LÓPEZ CARRO
93106d2f0c Update fr.coffee 
Je ne parle pas fraçaise mais...
 2015-09-29 13:44:22 -05:00
RUSLAN LÓPEZ CARRO
1ee7989b67 Update it.coffee 2015-09-29 12:40:12 -05:00
RUSLAN LÓPEZ CARRO
f74758ae31 Update es-419.coffee 
NOTE: review in spanish classes are grupos and lessons are clases. ( false cognate )
Nota: revisar; en inglés las classes significan grupos y las clases significan lessons ( es un cognado falso )
BTW... streamlined means that the groups have a chat and screen streamming with the professor?
 2015-09-29 11:01:06 -05:00
RUSLAN LÓPEZ CARRO
5c1c40a83b Update es-419.coffee 
ooops forgot to send yesterday :$
 2015-09-29 09:35:34 -05:00
Matt Lott
1557b7b442 🐛Fix jade i18n errors in courses pages 
Uncaught TypeError: Cannot read property 'i18n' of undefined
 2015-09-28 16:13:27 -07:00
Dmitry Suprun
75bc889f5a update courses section 2015-09-28 22:57:40 +03:00
Imperadeiro98
04a385c555 Uncommented two headers 2015-09-28 19:57:11 +01:00
RUSLAN LÓPEZ CARRO
2c2dd88505 es-419 Updated some courses translation 
title: "Título" #person title?
 2015-09-28 13:24:33 -05:00
Nick Winter
bf8ba8cbe1 Merge pull request #3064 from Driphter/master 
Fixed level/thang editor table for issue #3052
 2015-09-28 06:06:48 -07:00
Imperadeiro98
bae9e85ac2 Update pt-PT.coffee 2015-09-28 13:28:37 +01:00
Nick Winter
5ba607cac7 Fix invalid audio panning values 2015-09-27 20:34:00 -07:00
Nick Winter
88d11afb1d Propagate i18n 2015-09-27 19:57:57 -07:00
Nick Winter
26d9d20c26 Fix merge conflicts in es-ES.coffee 2015-09-27 19:56:41 -07:00
Nick Winter
4582a4499f Merge pull request #3059 from Imperadeiro98/master 
Added i18n to courses
 2015-09-27 19:52:52 -07:00
Imperadeiro98
350deee4f8 Uncommented an header from tr.coffee 2015-09-27 19:21:37 +01:00
Imperadeiro98
8ea5de0a88 Merge pull request #3061 from ecemm/patch-1 
Update tr.coffee
 2015-09-27 19:20:12 +01:00
Imperadeiro98
63e13a0222 Merge pull request #3067 from ilo/patch-2 
Changes for the Clan section
 2015-09-27 19:18:03 +01:00
duhow
d94eed98d4 Update es-ES.coffee 
Added some new translates and changes.
 2015-09-27 19:22:01 +02:00
Iñaki López
871a12e4ba Changes for the Clan section 
Translated clan section page strings, and fixed a typo.
 2015-09-27 23:09:25 +10:00
Iñaki López
040d075cac Update es-ES.coffee 
Some visible strings on the UI to a free account.
 2015-09-27 20:56:55 +10:00
Driphter
3b0bafd325 Fixed level/thang editor table for issue #3052 2015-09-26 20:07:36 -04:00
Imperadeiro98
ea96ff1383 Merge pull request #3060 from javatlacati/patch-1 
Update es-419.coffee
 2015-09-26 12:59:07 +01:00
Matt Lott
95319ecc3e Redirect /careers to Lever page 2015-09-25 15:49:00 -07:00
Matt Lott
686d7ac0a8 Fix course schema typo 2015-09-25 15:28:43 -07:00
Matt Lott
5eadd926b3 Move redeem prepaid code UI out of modal 2015-09-25 15:21:51 -07:00