Commit graph

11303 commits

Author SHA1 Message Date
Arthur Neves
6cb673e228
i18N press enter on spell view 2015-06-14 23:20:49 +02:00
Nick Winter
f7eaf91bae Hopefully making Systems editable by Artisans. 2015-06-14 12:49:45 -07:00
Nick Winter
7d637a0a27 Added a couple levels' next-campaign links. 2015-06-14 11:07:21 -07:00
Nick Winter
b1680f500b Merge branch 'master' of https://github.com/codecombat/codecombat 2015-06-14 11:06:48 -07:00
Nick Winter
1b38ffcd4c Merge branch 'Kavignon-SpanishTranslation' 2015-06-14 11:06:34 -07:00
Nick Winter
ac2039c81a Merged fr.coffee. 2015-06-14 11:06:15 -07:00
Imperadeiro98
e91526d692 Merge pull request #2825 from Ikuyadeu/patch-1
Update ja.coffee
2015-06-14 19:04:48 +01:00
Ikuyadeu
3f3f44038e Update ja.coffee 2015-06-14 17:11:26 +09:00
Kevin Avignon
e263866a3a Made some update within the spanish file 2015-06-13 23:33:48 -04:00
Kevin Avignon
c806b8865e Made some changes into the french file 2015-06-13 11:39:25 -04:00
Matt Lott
fdf500cac1 Average level playtimes script 2015-06-11 14:32:14 -07:00
Imperadeiro98
2f9e9b1b67 Merge pull request #2818 from Zleep-Dogg/da-translation
A bit of Danish translation pt. 2
2015-06-11 11:24:26 +01:00
Esben Madsen
db25007765 A bit of Danish translation pt. 2 2015-06-11 00:35:56 +02:00
Nick Winter
0b125c48ca Merge branch 'master' into production 2015-06-10 15:20:02 -07:00
Nick Winter
a85d52ebe2 Made a tabbed interface for Programmaticon V's Vector and standard library documentation. 2015-06-10 15:18:37 -07:00
Imperadeiro98
28b7820149 Merge pull request #2814 from Zleep-Dogg/da-translation
A bit of Danish translation
2015-06-10 10:58:28 +01:00
Esben Madsen
8293c717a1 A bit of Danish translation 2015-06-10 01:05:12 +02:00
Imperadeiro98
1383d4c9b7 Merge pull request #2813 from Danylo-Dubinin/patch-3
translate few strings
2015-06-09 19:44:56 +01:00
Nick Winter
906ef88115 Merge branch 'master' into production 2015-06-09 11:23:35 -07:00
Nick Winter
bb417e9a97 Tweaked glacier terrain generation to work similarly to dungeon (still needs flare) for #2812. 2015-06-09 11:23:05 -07:00
Nick Winter
4329861bc4 Merge pull request #2812 from nemoyatpeace/patch-6
Added Ice Level to terrain generator
2015-06-09 11:13:48 -07:00
Danylo Dubinin
c0f05e7c86 translate few strings 2015-06-09 18:42:20 +03:00
nemoyatpeace
e0e62271b4 Added Ice Level to terrain generator 2015-06-09 18:30:40 +08:00
Imperadeiro98
66c126a8df Update pt-PT.coffee 2015-06-08 23:39:34 +01:00
Imperadeiro98
c1d8022f35 Merge pull request #2811 from Danylo-Dubinin/patch-2
Improve translation, add infinite loop
2015-06-08 22:35:17 +01:00
Nick Winter
1dab44f1bf Merge branch 'master' into production 2015-06-08 13:23:31 -07:00
Nick Winter
4e08d453b7 Added some code for the glacier world. 2015-06-08 13:20:54 -07:00
Danylo Dubinin
fe8c680fb1 Improve translation, add infinite loop
Better translation of "comment out" phrase and correct translation of "rewind and fast-forward".
2015-06-08 21:45:51 +03:00
Imperadeiro98
fa273d7535 Update pt-PT.coffee 2015-06-08 18:19:27 +01:00
Matt Lott
1da13b33c3 Merge branch 'master' into production 2015-06-08 07:16:41 -07:00
Matt Lott
021ff541e4 Add separate school field for teacher survey 2015-06-08 06:39:30 -07:00
Imperadeiro98
a9f8a7b1be Fixed some typos 2015-06-08 14:32:55 +01:00
Matt Lott
78004a0a94 Trial requests localization typo
Adding missing period at end of approved sentence.
2015-06-08 06:27:40 -07:00
Matt Lott
9b37c9f18a 🐛Fix trial request onclick 2015-06-08 06:27:40 -07:00
Imperadeiro98
198806bfc9 Removed hard-coded strings...
... from teachers-free-trial.jade
2015-06-08 14:16:24 +01:00
Imperadeiro98
6960358850 Update pt-PT.coffee 2015-06-07 22:58:54 +01:00
Imperadeiro98
b9b36d5fea Update en.coffee 2015-06-07 22:54:39 +01:00
Imperadeiro98
a421a401f7 Merge pull request #2810 from nixel2007/master
Propageted i18n
2015-06-07 22:40:08 +01:00
Nikita Gryzlov
730a0f5e36 Propageted i18n 2015-06-07 23:09:03 +03:00
Imperadeiro98
86c283aec3 Merge pull request #2809 from Danylo-Dubinin/patch-1
'viking' translation, 'fight' mistake fix
2015-06-07 20:42:08 +01:00
Danylo Dubinin
dd5ac2eda6 'viking' translation, 'fight' mistake fix
Правильніше "У бій!" за правилами вживання прийменників у/в.
2015-06-07 19:21:15 +03:00
Nick Winter
9ee8734c62 Merge branch 'master' into production 2015-06-05 17:02:55 -07:00
Nick Winter
0d99b07bc3 Made it so that high scores and level victories are not achieved when playing changed levels from inside the level editor. Some additions for Nalfar. 2015-06-05 17:02:37 -07:00
Imperadeiro98
3f23598c60 Update teacher trial copy 2015-06-05 23:44:31 +01:00
Matt Lott
12b28234a7 Update teacher trial copy 2015-06-05 15:18:47 -07:00
Nick Winter
ccd96122e1 Tweaked Nalfar's hero modal positioning. 2015-06-05 15:13:22 -07:00
Matt Lott
251fcf05fd Merge branch 'master' into production 2015-06-05 15:12:36 -07:00
Matt Lott
32b10b33e4 Update gem charge statement descriptors
Shown on bank statements and credit bills.
2015-06-05 14:58:44 -07:00
Imperadeiro98
7b92bf8c84 Updated i18n in en.coffee 2015-06-05 20:49:08 +01:00
Imperadeiro98
df9a115eb0 Added i18n to teachers-free-trial.jade 2015-06-05 20:49:03 +01:00