Commit graph

11303 commits

Author SHA1 Message Date
Imperadeiro98
57c227e9c6 Merge pull request #2985 from kerradus/ru-translation
add some translation
2015-09-02 21:10:05 +01:00
sake12
0b5c3ad3d0 pl.coffee - update 2015-09-02 21:29:24 +02:00
sake12
b098d0d685 Merge branch 'master' into codecombat/master 2015-09-02 20:59:04 +02:00
Michael Schmatz
583d415796 Merge pull request #2986 from codecombat/master
Enable Sao Paulo servers
2015-09-02 13:39:52 -04:00
Dmitry Suprun
d85b656b24 add some translation 2015-09-02 19:39:55 +03:00
Michael Schmatz
be80b1e355 Add Sao Paulo database condition 2015-09-02 12:33:48 -04:00
Michael Schmatz
704c05bbe5 Add Sao Paulo config options 2015-09-02 12:30:31 -04:00
Eero Penttilä
592bb6b472 fi.coffee translated: choose_hero, skill_docs
Some new translations and some fluency modifications.
There is some word placement problems in these sections:
-in lines 495 - 500 the words added between the texts 1,2 and 3 won't fit in Finnish. Could this be replaced with one sentence where the added words would be described like '__nAttackDamage__' etc.?
-in line 510 there is word 'Action' added in front of this word, and I didn't find it in the translation document.
I'll try to make some kind of bug repot of these things also...
2015-09-02 18:58:21 +03:00
Nick Winter
356abd6b36 Merge branch 'master' into production 2015-09-02 05:34:00 -07:00
Nick Winter
6463b04c5c Not trying to play a certain sound we don't have yet. 2015-09-02 05:32:45 -07:00
Eero Penttilä
8328a62409 fi.coffee translated: subscribe 2015-09-02 15:12:27 +03:00
Eero Penttilä
f1224c7107 fi.coffee translated: buy_gems 2015-09-02 14:00:10 +03:00
Matt Lott
aa16348ded Remove target subs line from subs dashboard 2015-08-31 05:46:13 -07:00
Matt Lott
ad079f1ff9 🐛Fix trial requests approval page width overflow 2015-08-31 05:40:07 -07:00
Imperadeiro98
cacd3b7931 Merge pull request #2979 from Pena86/patch-1
Some new translations
2015-08-31 13:34:12 +01:00
Eero Penttilä
98273a5520 Some new translations
Translated: Clans, user.
and some fixes for fluency
2015-08-31 15:24:30 +03:00
sake12
eb50a2f761 pl.coffee - another update 2015-08-31 12:05:21 +02:00
Imperadeiro98
62b6edc574 Merge pull request #2978 from sake12/master
pl.coffee - update
2015-08-31 10:53:44 +01:00
sake12
b5311c4589 pl.coffee - update 2015-08-30 23:29:22 +02:00
Nick Winter
844e6c5237 Merge branch 'master' into production 2015-08-30 07:28:48 -07:00
Nick Winter
b383c6ac00 Updated inventory for Ace of Coders. 2015-08-30 07:28:35 -07:00
Nick Winter
6a85074ef3 Merge branch 'master' into production 2015-08-29 10:02:03 -07:00
Nick Winter
635dcf22ae Fixed typo for Okar session check. Not showing some common sub-skills as skills on hero picker. 2015-08-29 10:01:53 -07:00
Nick Winter
bf0422a9d6 Merge branch 'master' into production 2015-08-29 08:02:31 -07:00
Nick Winter
88f6e528b1 Implementing goliath. Configuring goliath for Ace of Coders. 2015-08-29 08:02:20 -07:00
Matt Lott
8de00767b3 Initial courses object model 2015-08-29 07:15:39 -07:00
Imperadeiro98
10e33dab4a Uncommented an header from ja.coffee 2015-08-29 09:49:23 +01:00
Imperadeiro98
8333e57ce2 Merge pull request #2977 from Ikuyadeu/patch-1
Update ja.coffee
2015-08-29 09:48:33 +01:00
Imperadeiro98
11564571d3 Merge pull request #2972 from sodaorange/patch-1
Update ja.coffee
2015-08-29 09:47:39 +01:00
Ikuyadeu
5d49e1cb9a Update ja.coffee 2015-08-29 16:22:41 +09:00
Imperadeiro98
0357a59cb9 Uncommented some headers from nl-BE.coffee 2015-08-28 22:21:54 +01:00
Imperadeiro98
d415ee25cd Merge pull request #2973 from WardLanssens/patch-1
Update nl-BE.coffee
2015-08-28 22:18:18 +01:00
Matt Lott
545567a24b Courses UI: Add teachers mode button to landing page 2015-08-28 11:33:37 -07:00
Matt Lott
a1927bf8cc Courses UI: Update tabs on details page 2015-08-28 10:53:24 -07:00
Nick Winter
4ca476713e Merge branch 'master' into production 2015-08-28 10:45:19 -07:00
Nick Winter
d412a7d5ee Fixed blank duel stats bar in single player, oops. Handling getTwoGames from non-logged-in users. 2015-08-28 10:45:07 -07:00
WardLanssens
bfe061dc2b Update nl-BE.coffee 2015-08-28 10:38:14 +02:00
sodaorange
1aa93fbd8a Update ja.coffee 2015-08-27 22:20:02 -04:00
Matt Lott
066d6e7fc1 Courses UI: Add FAQ popup to landing page 2015-08-27 16:52:02 -07:00
Matt Lott
a27c17ef0a Courses UI: Add image to sales blurb and quote 2015-08-27 16:19:37 -07:00
Matt Lott
c8451a7830 Merge branch 'master' into production 2015-08-27 14:17:05 -07:00
Matt Lott
24fb52a8d9 Update year sub sale copy 2015-08-27 10:54:52 -07:00
Matt Lott
448f4fce88 Merge branch 'master' into production 2015-08-27 09:48:48 -07:00
Matt Lott
e10c5d9646 Allow year sub purchases on top of monthly subs
Monthly sub is cancelled, terminal sub of 1 year + remaining month is
added.
2015-08-27 09:45:10 -07:00
Matt Lott
5faeb82d17 Extend terminal sub with year sub purchase 2015-08-27 09:45:10 -07:00
Imperadeiro98
2ad285093a Merge pull request #2962 from nantoniazzi/patch-1
Update fr.coffee
2015-08-27 11:29:08 +01:00
Imperadeiro98
78b136d69c Fixed {changed} in english file 2015-08-27 10:41:13 +01:00
Matt Lott
264767e9e8 Add HipChat msg for Stripe payments 2015-08-26 15:37:58 -07:00
Matt Lott
761402b117 Add hipchat msg for year sub sale 2015-08-26 15:31:22 -07:00
Matt Lott
b6ddb41df6 Add sale end date to year sub page 2015-08-26 15:22:56 -07:00