Commit graph

5477 commits

Author SHA1 Message Date
Nick Winter
36fcd1bb79 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-30 07:52:09 -08:00
Nick Winter
77cca7189f Updated a bunch of code that got busted with CoffeeScript 1.9.0. 2015-01-30 07:51:57 -08:00
Imperadeiro98
ad05ddc221 Fixed merge issues 2015-01-30 15:33:53 +00:00
Imperadeiro98
32dc5fdc34 Merge pull request #2176 from jacobakkerboom/patch-1
Update nl-NL.coffee,
2015-01-30 15:30:32 +00:00
Imperadeiro98
cd7f09e626 Merge pull request #2172 from JulR43/patch-1
Update fr.coffee
2015-01-30 15:29:23 +00:00
Jacob
6e08e5406e Update nl-NL.coffee,
Submitted reasonably many translations. Did not look how the translations looked on my own server, but I did recognise most texts for which I provided a translation (so that for most options I had a good idea what their purpose was). This is my first edit, so I am not well aware of any unwritten rules about translating. 

I tried to be reasonable in using comments. For some things like the translation of subscriber (abonnee), running (uitvoeren o.i.d.) and equipment (uitrusting) some discussion might be nice, in order to have consistency. I have however refrained from using very long comments. I am actually not even aware of what the default action is when no translation is present, which I assume is simply to use the English version. I suppose the main purpose of the Dutch translation is to help children, so this is what I mainly had in mind. Feel free to contact me about subjects like this. I will try to learn more by inspecting previous edits.
2015-01-30 12:42:27 +01:00
Nick Winter
39ad9b8e35 Show hero unlocks in campaign editor, too. 2015-01-29 19:29:37 -08:00
Nick Winter
1630b30351 Fixed showing hero unlock portraits on world map. Showing them now even before their levels are unlocked, and showing until you purchase, not just unlock them. 2015-01-29 19:05:30 -08:00
Nick Winter
fd0e7a8c44 Picked some slightly less awful particle colors for different terrains and level types. Enabled for half the players. 2015-01-29 18:19:03 -08:00
Matt Lott
92f070ecca Fix help video events
Removing the protocol broke the video player event hooks.
2015-01-29 16:45:18 -08:00
Nick Winter
5addacddf0 First draft of ParticleMan particle emitters for showing hidden levels in CampaignView. 2015-01-29 16:11:13 -08:00
Nick Winter
57d12c199e Tweaks to campaign status view. Hooking up i18n for Campaigns, but it doesn't work yet. 2015-01-29 09:07:25 -08:00
JulR43
0c1897bbb3 Update fr.coffee
Several translates
2015-01-29 16:56:37 +00:00
Nick Winter
aab6d17047 Added campaign completion progress indicator. 2015-01-29 08:26:12 -08:00
Imperadeiro98
239b72dd01 Merge pull request #2169 from scenix007/patch-1
add some translation for tips
2015-01-29 16:17:34 +00:00
Jhoon Saravia
8325d522fb Finished translations on tips 2015-01-29 08:57:29 -05:00
Long Shao
14af5c309d add some translation for tips
Update zh-HANS.coffee : add some translation for tips
2015-01-29 18:13:10 +08:00
Nick Winter
a6043ca1be Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-28 17:59:11 -08:00
Nick Winter
22070ddff2 Identifying lastLevel to Segment. Added Ogre Headhunter names. 2015-01-28 17:58:56 -08:00
Nick Winter
f9d2a06379 Merge pull request #2168 from yaur/master
Fix windows build
2015-01-28 17:52:49 -08:00
Matt Lott
8b51c3cb5d Stop subscribe modal A/B test
Group A (original) wins.
2015-01-28 16:20:10 -08:00
yaur
dc39a55cf8 remove logging 2015-01-28 18:37:07 -05:00
yaur
30f9188090 Remove the scheme from help videos so that they maintain the scheme of the
calling page
2015-01-28 18:33:28 -05:00
nixel2007
1ff5832436 fix ru.coffee 2015-01-28 22:07:19 +03:00
nixel2007
d086555fb7 Update ru.coffee 2015-01-28 21:50:16 +03:00
Imperadeiro98
354a7cb71b Merge pull request #2160 from rsiwady29/spanish_translations
Update es-419.coffee
2015-01-28 18:18:35 +00:00
Imperadeiro98
8cf424f7ef Update pt-PT.coffee 2015-01-28 18:16:34 +00:00
Nick Winter
bf3c997d9d Merge pull request #2139 from katemamba/long-name
#2125 Long player names overflow
2015-01-28 08:56:26 -08:00
Richard Siwady
8d001a6281 Update spanish translations for es-419 2015-01-28 00:12:40 -06:00
Richard Siwady
7cb6791a58 Fixed lua_blurb es-419 translation. 2015-01-27 23:16:08 -06:00
Nick Winter
5f8ec2b21b Propagated i18n. 2015-01-27 20:36:40 -08:00
Nick Winter
7cb92136cc Added some Skeleton names. 2015-01-27 18:04:07 -08:00
divyanshu013
cfdbabb576 Added some quotes for #710 2015-01-27 21:53:37 +05:30
Nick Winter
2e09a94736 Asking for feedback when cancelling subscriptions. 2015-01-26 16:48:32 -08:00
Matt Lott
019406a341 Update campaign analytics
Increase line graph dots for larger hover targets.
Update missing day data handling to fill in graph points for any
missing day, not just most recent end days.
Fix level completion div0 bug.
2015-01-26 14:58:38 -08:00
Nick Winter
e41652730d Don't warn about missing misc System. 2015-01-26 14:51:04 -08:00
Matt Lott
24f8029aff 🐛Fix campaign editor analytics
Line graph checkboxes need their own labels.
2015-01-26 13:36:07 -08:00
Matt Lott
48a8ed109d Update campaign editor analytics
Add line graphs to level view.
2015-01-26 13:19:10 -08:00
divyanshu013
59df5a2a8c Added some names for #53 2015-01-27 01:21:04 +05:30
Imperadeiro98
462b60191f Don't force https 2015-01-25 18:56:30 +00:00
Imperadeiro98
19c03952e1 Merge pull request #2129 from chess9876543210/patch-1
Propagated i18n.
2015-01-25 18:34:44 +00:00
Pavan Kate
2004e91e38 #2125 Long player names overflow 2015-01-25 06:03:41 +05:30
Imperadeiro98
8acb5a5ac8 Update teachers.jade 2015-01-24 12:44:06 +00:00
jmigual
5e58986e75 Added some translations 2015-01-23 22:12:18 +01:00
Nick Winter
8f4b3cb85f Deleted unneeded campaign label. 2015-01-22 16:33:35 -08:00
Nick Winter
e3bf8f74ab Trying to stagger LevelSessions saves on wins on replayable levels to see if that might help #2108 at all. 2015-01-22 12:26:37 -08:00
Imperadeiro98
0d00917ca0 Fixed order 2015-01-22 19:28:17 +00:00
Imperadeiro98
ca792b1edc Merge pull request #2133 from nixel2007/master
Update ru.coffee
2015-01-22 19:26:49 +00:00
Nick Winter
64008276c2 Finally translating level names and descriptions in the campaign view. 2015-01-22 11:22:35 -08:00
nixel2007
6b5c69f889 ru.coffee - small fix 2015-01-22 22:16:37 +03:00
nixel2007
44c97428e3 Update ru.coffee 2015-01-22 22:14:56 +03:00
Imperadeiro98
bb0a820638 Update pt-PT.coffee 2015-01-22 19:04:41 +00:00
Nick Winter
e49a70a62e Fixed mountain map background ratio. 2015-01-22 10:48:41 -08:00
Nick Winter
9e496fa9d0 Propagated i18n. 2015-01-22 10:45:51 -08:00
Nick Winter
9b1923d943 Merge pull request #2119 from AdnanZahid/patch-2
Added 6 new tips for the loading screen
2015-01-22 10:44:32 -08:00
Nick Winter
d24469d8ce Merge pull request #2118 from AdnanZahid/patch-1
Added 6 new tips for the loading screen
2015-01-22 10:44:22 -08:00
Nick Winter
ccf4f0180e Resolved ca.coffee merge conflicts. 2015-01-22 10:42:04 -08:00
Imperadeiro98
76906a15fc Uncommented an header 2015-01-22 16:28:27 +00:00
Imperadeiro98
4a45b5290e Merge pull request #2132 from z3t1/patch-1
Translation of several pharses
2015-01-22 16:27:31 +00:00
Imperadeiro98
45f4ae9e42 Merge pull request #2131 from probil/patch-1
Update Ukrainian l18n
2015-01-22 16:24:25 +00:00
z3t1
1e5ef588d8 Translation of several pharses 2015-01-21 20:56:13 -05:00
Matt Lott
3f40364616 Update campaign editor analytics
Add date range picker to level view.
2015-01-21 16:03:50 -08:00
Maks Lyashuk
82bc526bd7 Update Ukrainian l18n
Translated some new lines
2015-01-22 00:17:03 +02:00
Matt Lott
e49c74259b Update campaign editor analytics
Adding shown and purchased subscription counts.
Locking down analytics to admin-only.
2015-01-21 13:41:38 -08:00
Matt Lott
6b271799be Update level loading view sub event data
Sending level slug instead of name.
2015-01-21 13:41:38 -08:00
chess
a118a7cf75 i18 update
old non abonement text replaced with new version
2015-01-21 21:28:53 +01:00
Nick Winter
7dd128780f Unlocking all audition levels in Auditions campaign. 2015-01-21 11:49:56 -08:00
Matt Lott
3c36d1cc06 Update campaign editor analytics
Adjust level completion line graph stroke-weight based on daily started
count in campaign overview.
2015-01-20 16:04:02 -08:00
Matt Lott
d51eddef29 Update campaign editor analytics
Double-click level row in overview to open level details view.
2015-01-20 15:02:24 -08:00
Matt Lott
ffb59d5cec Disable prod admin internal analytics tracking 2015-01-20 14:18:31 -08:00
Imperadeiro98
25f01db701 Merge pull request #2116 from McGiogen/patch-1
Added some simple translations all over the file
2015-01-20 20:40:17 +00:00
Matt Lott
f38a67b96a Update campaign editor analytics
Add playtime bar graphs.
2015-01-20 11:43:13 -08:00
Matt Lott
d368e3ffd8 Fix campaign editor analytics
Dividing by zero for level completion spark lines in campaign overview
analytics modal.
2015-01-20 11:14:50 -08:00
Matt Lott
7fda59ee2d Update campaign editor analytics
Adding help click counts and help videos start counts to level view
analytics.
2015-01-20 10:43:02 -08:00
Matt Lott
d0a0c95623 Update campaign editor analytics
Display little level completion line graphs in the level completion
table cells.
2015-01-19 21:59:25 -08:00
Matt Lott
499e7c2999 Update campaign editor analytics
Color in level name based on number of users remaining.
2015-01-19 15:21:42 -08:00
Imperadeiro98
e00e699e6f Update pt-PT.coffee 2015-01-19 20:50:08 +00:00
Imperadeiro98
7e7945fc04 Activated some translations 2015-01-19 20:30:05 +00:00
Marielle Bannink
41239494e5 Update nl-NL.coffee
Added some translations to the file
2015-01-19 20:33:51 +01:00
Adnan Zahid
f46160fff9 Added 6 new tips for the loading screen (Also written in level_loading.jade)
Added the following tips:

1) play_level.tip_control_destiny
2) play_level.tip_no_code
3) play_level.tip_code_never_lies
4) play_level.tip_reusable_software
5) play_level.tip_optimization_operator
6) play_level.tip_lines_of_code
2015-01-20 00:12:21 +05:00
Adnan Zahid
375d388fe3 Added 6 new tips for the loading screen
Added the following tips:

1) play_level.tip_control_destiny
2) play_level.tip_no_code
3) play_level.tip_code_never_lies
4) play_level.tip_reusable_software
5) play_level.tip_optimization_operator
6) play_level.tip_lines_of_code
2015-01-20 00:06:29 +05:00
Matt Lott
05f028d944 Update campaign editor analytics
Adding ‘left game’ counts to overall campaign view.  This is the number
of players that left the game after playing the given level.
2015-01-18 16:29:47 -08:00
McGio
6473c7e94a Added some simple translations all over the file 2015-01-18 16:56:35 +01:00
nixel2007
19802cd0c5 Update ru.coffee 2015-01-18 00:44:31 +03:00
Imperadeiro98
c12d10a06b Fixed some issues 2015-01-17 18:54:34 +00:00
Shuyu Zhang
1bc4846c5e Update zh-HANS.coffee 2015-01-17 10:14:45 -08:00
Imperadeiro98
165582a55c Some fixes 2015-01-17 10:19:31 +00:00
Imperadeiro98
95d2d36129 Merge pull request #2110 from noiseorigin/patch-1
Update zh-HANS.coffee
2015-01-17 10:17:03 +00:00
Shuyu Zhang
13ad53ee04 Update zh-HANS.coffee 2015-01-17 00:06:04 -08:00
Nick Winter
706b2ca930 Don't includeFlow for Thangs with skipProtectAPI on, because we don't care about their flow anyway (non-read-write custom Programmables). 2015-01-16 18:47:30 -08:00
Matt Lott
d532d9fe6e Add date picker to campaign editor analytics
Only for overall campaign editor analytics.  Still need to add date
pickers to individual level views.
Moving campaign editor analytics to its own modal to support reloading
with new dates.
The date picker widget works poorly, but you can type in dates if
necessary.
Also moving analytics button up into the top right header, with a
little stats glyph icon.
2015-01-16 15:44:28 -08:00
Shuyu Zhang
1039afc85b Update zh-HANS.coffee 2015-01-16 15:03:04 -08:00
Shuyu Zhang
e46c6828b9 Update zh-HANS.coffee 2015-01-16 14:34:24 -08:00
Imperadeiro98
974c9e538d Update add-thang-components-modal.jade 2015-01-16 21:08:32 +00:00
Imperadeiro98
91515ef5a1 Update pt-PT.coffee 2015-01-16 20:58:17 +00:00
Imperadeiro98
699a15919c Update loading-error.jade 2015-01-16 20:55:20 +00:00
Nick Winter
3051dc32fa Propagated i18n. 2015-01-16 12:53:14 -08:00
Imperadeiro98
feae3694f7 Update en.coffee 2015-01-16 20:52:55 +00:00
Imperadeiro98
653263a069 Update save-version-modal.jade 2015-01-16 20:52:47 +00:00
Nick Winter
f86d106077 Showing replayable level difficulty in control bar. 2015-01-16 12:50:10 -08:00