Scott Erickson
07afba01df
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/views/editor/level/thangs_tab_view.coffee
2014-04-17 13:25:42 -07:00
Scott Erickson
8859405e18
Reworked the nav bars in the level editor.
2014-04-17 11:02:00 -07:00
ONion
498bb21280
Update zh-HANS.coffee
...
more translation
2014-04-17 13:27:43 +08:00
ONion
8724e23f1b
Update zh-HANS.coffee
...
add punctuation
2014-04-17 12:57:44 +08:00
ONion
cf9cd1a228
Update zh-HANS.coffee
...
Translate some
2014-04-17 12:55:58 +08:00
Nick Winter
f95d814e90
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-16 12:57:31 -07:00
Nick Winter
f6242bbbac
Fixed case on de-CH.coffee.
2014-04-16 12:28:39 -07:00
Nick Winter
1a4274a6db
Broken German up into multiple country-specific Germans.
2014-04-16 12:28:15 -07:00
Glen De Cauwsemaecker
0bf4c81c91
Merge branch 'enGB' of https://github.com/edtrist/codecombat
2014-04-16 20:11:03 +02:00
Nick Winter
cc9e200db8
Merge branch 'patch-2' of git://github.com/npani13/codecombat into npani13-patch-2
2014-04-16 11:01:28 -07:00
Nick Winter
d65699736f
Fixed accidental hu.coffee truncation from #833 .
2014-04-16 10:58:27 -07:00
Scott Erickson
731726dcd3
Merge branch 'master' into feature/jsondiffpatch
2014-04-16 10:42:43 -07:00
edtrist
0047835021
Added some specific en-GB spellings
2014-04-16 18:42:37 +01:00
Scott Erickson
c395a3414e
Merge branch 'master' into feature/jsondiffpatch
2014-04-15 15:18:57 -07:00
Scott Erickson
58b1019934
Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor.
2014-04-15 15:09:36 -07:00
Nick Winter
f762d95ab8
ModelModal and simple leaderboard pagination.
2014-04-15 15:01:54 -07:00
Inez KEMENES
844643454d
Update hu.coffee
2014-04-15 17:03:17 +02:00
Glen De Cauwsemaecker
1354bc3d59
Merge https://github.com/codecombat/codecombat
2014-04-15 02:05:38 +02:00
Glen De Cauwsemaecker
891cf74a8a
Resolved merge conflicts of Jasper's translations
2014-04-15 02:04:52 +02:00
Nick Winter
e908ae2fb4
Fixed #772 .
2014-04-14 14:49:38 -07:00
npani13
5d16f8e5ba
Create de-ch.coffee
...
Speechdata for Swissgerman (CH)
2014-04-14 20:21:58 +02:00
Michael Schmatz
b40e4dca37
Simulation leaderboard aggregation framework and local fixes
2014-04-14 08:46:46 -07:00
Glen De Cauwsemaecker
df17021344
Merged conflicts and fixed line endings windows => unix
2014-04-14 10:12:23 +02:00
OlenaGapak
aea7b3ada0
Update uk.coffee
...
Ukrainian localization
2014-04-14 10:36:55 +03:00
Nick Winter
fbc8b6ac35
Propagated new i18n tags.
2014-04-13 19:04:43 -07:00
林鑫
2bf654c8fa
Translate some items under 'common','versions' and 'editor'.
2014-04-14 08:57:04 +08:00
Nick Winter
af0b8aa5e2
A few fixes and cleanup for #831 .
2014-04-13 15:28:16 -07:00
Inez KEMENES
094704f0c5
Update hu.coffee
2014-04-13 17:29:29 +02:00
Glen De Cauwsemaecker
0ce04b147d
Merge pull request #824 from julycoolwind/patch-1
...
Update zh-HANS.coffee
2014-04-13 13:49:55 +02:00
Jasper D'haene
9f1ef2bb8d
updated Dutch locale + README
2014-04-13 12:05:45 +02:00
Alexei Nikitin
9879cffdbc
Update RU.coffee
2014-04-13 01:06:42 +04:00
Scott Erickson
6eab5003f8
Merge branch 'feature/jsondiffpatch'
2014-04-12 08:52:35 -07:00
Scott Erickson
10b1660419
Fixed the level editor so you can save again.
2014-04-12 08:48:49 -07:00
julycoolwind
9078061af2
Update zh-HANS.coffee
...
Translate items under editor.
2014-04-12 17:56:56 +08:00
Scott Erickson
35fe47bbac
Merge branch 'feature/jsondiffpatch'
2014-04-11 22:52:58 -07:00
Scott Erickson
53579b2632
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
2014-04-11 22:52:05 -07:00
Nick Winter
bbf26ecc9c
Fixed lcoale line endings again.
2014-04-11 15:02:01 -07:00
Glen De Cauwsemaecker
e9715f078f
Fixed merge conflicts for Jasper's commits.
2014-04-12 01:28:25 +02:00
Nick Winter
82b47f6c0f
Added i18n for #809 .
2014-04-11 13:37:39 -07:00
Nick Winter
5ccdf680db
Updated all i18n tags.
2014-04-11 13:19:38 -07:00
Nick Winter
ae65f07e7e
Added some i18n and improved employer page.
2014-04-11 12:49:44 -07:00
Nick Winter
ca13324e99
Resolved merge conflicts.
2014-04-11 11:32:51 -07:00
Nick Winter
8d5e129c2c
Merged the jobs in. Look out for Treema bugs from the last four months.
2014-04-11 10:20:12 -07:00
Jasper D'haene
f2332b0694
Completed + reviewed latest Dutch locale changes
2014-04-11 09:11:12 +02:00
Jasper D'haene
23cb736d71
resolved merge conflicts
2014-04-11 08:05:11 +02:00
Nick Winter
7a35a6248f
Adding contact form for employers to contact candidates.
2014-04-10 14:59:32 -07:00
Nick Winter
dd46f9d039
Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks.
2014-04-09 16:46:44 -07:00
DjBRINE
7f4c251f43
Update ru.coffee
2014-04-09 03:57:40 -07:00
Alper ALIN
a2ebcc6433
Update tr.coffee
...
a few changes
2014-04-09 12:31:25 +03:00
Glen De Cauwsemaecker
4bd058d1be
Merge branch 'master' of https://github.com/1c7/codecombat
2014-04-08 16:25:29 +02:00
1c7
102c707fa9
Chinese Translate(zh-HANS.coffee)
2014-04-08 22:17:40 +08:00
Glen De Cauwsemaecker
e02087f4ed
Merge pull request #798 from endrilian/patch-1
...
Update uk.coffee
2014-04-08 15:15:58 +02:00
Alexei Nikitin
33f26c3da0
Sync i18n
2014-04-08 12:23:16 +04:00
Glen De Cauwsemaecker
afbfa08416
fixed errors made in last contribution to the Turkish translation.
2014-04-08 09:06:11 +02:00
Alexei Nikitin
f8d6857633
Fix crlf
2014-04-08 10:50:58 +04:00
Alex
f798142b87
Update uk.coffee
2014-04-08 01:51:40 +03:00
Alexei Nikitin
e87c0c4b91
Work on thang tab
2014-04-08 02:49:27 +04:00
Alper ALIN
51847c77ce
Update tr.coffee
2014-04-08 00:40:25 +03:00
Alexei Nikitin
5f062ad25c
Work on revert, save modal
2014-04-08 01:38:46 +04:00
Alexei Nikitin
d64690e8d9
Work on fork modal
2014-04-08 00:29:40 +04:00
Alexei Nikitin
69406df0ed
Work on create_new modal
2014-04-07 23:27:42 +04:00
Alexei Nikitin
630c44135a
Work on wizard settings
2014-04-07 21:44:47 +04:00
Alexei Nikitin
9dab4b39e6
Update ru.coffee
2014-04-07 19:46:01 +04:00
OlenaGapak
780541ea58
Update uk.coffee
...
ukrainian localization
2014-04-07 15:35:09 +03:00
Nick Winter
4070aab48a
Merge pull request #777 from Digot/patch-1
...
Update de.coffee
2014-04-06 14:37:43 -07:00
Nick Winter
06d846ccbf
Fixed bugs with some i18n from #793 ; copied new i18n tags over.
2014-04-06 14:35:40 -07:00
Nick Winter
8f1ef4e3bb
Merge pull request #793 from kinez/patch-4
...
Update hu.coffee
2014-04-06 14:26:06 -07:00
Nick Winter
31a170bf67
Merge pull request #771 from kinez/patch-2
...
Update hu.coffee
2014-04-06 14:24:38 -07:00
Nick Winter
69ba442261
Merge pull request #770 from kinez/patch-1
...
Update hu.coffee
2014-04-06 14:24:32 -07:00
Inez KEMENES
7d3b7de8b4
Update hu.coffee
2014-04-06 16:49:00 +02:00
Glen De Cauwsemaecker
3feb694756
Merge pull request #788 from 1c7/master
...
Chinese translate for windows automatic tool
2014-04-06 12:17:01 +02:00
Glen De Cauwsemaecker
9ea8282b89
Merge pull request #790 from zloysmiertniy/patch-1
...
Update es-419.coffee
2014-04-06 12:12:44 +02:00
Vindurrin
7a8f3849a6
Update es-ES.coffee
...
Line #231 , “Atajos de teclado” means “Keyboard Shortcuts” — let me know if this isn’t close enough to what is meant by “Key Bindings”: the reason that I chose this phrase is because I don’t know of an exact or approximate translation of “key bindings” into Spanish, but several other software platforms have used the phrase “atajos de teclado” to express this meaning.
2014-04-05 21:09:10 -04:00
Nick Winter
5c8c7fff1d
Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower.
2014-04-05 17:05:03 -07:00
Evelyn Solorzano
af887fd4b8
Update es-419.coffee
...
Translated some commented lines up to play: category
2014-04-05 18:21:05 -05:00
1c7
51142627d4
translate app/locale/zh-HANS.coffee
2014-04-05 14:34:21 +08:00
Alexei Nikitin
63f72cb454
Update ru.coffee
2014-04-04 10:01:03 -07:00
Vindurrin
79d19d61db
Update pt-BR.coffee
2014-04-04 00:14:28 -04:00
Scott Erickson
978c84bc89
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-03 18:43:36 -07:00
Scott Erickson
3b3b825be0
Set up a new loading/progress system for views.
2014-04-03 18:43:29 -07:00
Darredevil
df3b51e5bd
Update ro.coffee
2014-04-04 02:15:50 +03:00
Nick Winter
62f91d14b0
Merged.
2014-04-03 16:06:32 -07:00
Vindurrin
d58c70b456
Update es-ES.coffee
2014-04-03 16:11:09 -04:00
Digot
eca934d6a5
Update de.coffee
2014-04-03 21:58:12 +02:00
Michael Schmatz
c434325ec0
Fixed line endings and locale error
2014-04-03 10:53:29 -07:00
Glen De Cauwsemaecker
12cf298467
Merge conflicts master
2014-04-03 17:42:08 +02:00
Glen De Cauwsemaecker
a2ac89094a
Merge conflicts: ms.coffee
2014-04-03 17:38:46 +02:00
Nick Winter
52de546727
Merged.
2014-04-02 15:09:40 -07:00
Inez KEMENES
70d42b6eae
Update hu.coffee
2014-04-02 16:00:15 +02:00
Inez KEMENES
9acde85c8c
Update hu.coffee
2014-04-02 15:24:26 +02:00
Nick Winter
ae9769e3ce
Added read only notification in editors. Fixed #374 .
2014-04-01 13:15:30 -07:00
Nick Winter
7807fdbbc6
Merged pt-PT locale conflicts.
2014-04-01 10:41:40 -07:00
Dominik Kundel
45f1d8d408
added two programming quotes
2014-04-01 17:16:35 +02:00
OlenaGapak
1799310261
Update uk.coffee
...
ukrainian localization
2014-04-01 14:59:46 +03:00
jaudhaen
be9edb74af
updated dutch locale
2014-04-01 09:26:42 +02:00
Michael Schmatz
f084588adf
Merge pull request #758 from dkundel/master
...
update de.coffee
2014-03-31 16:06:38 -07:00
Nick Winter
0bd8321345
Updated Mondo Bizarro i18n comma.
2014-03-31 16:02:56 -07:00
Dominik Kundel
a9b225ec03
fixed indentation de.coffee
2014-04-01 00:55:45 +02:00
Dominik Kundel
069a7a41e4
update de.coffee
2014-04-01 00:34:51 +02:00
Michael Schmatz
b021b65ee1
Copied new i18n tags to all languages
2014-03-31 15:31:38 -07:00
Alexei Nikitin
0473ce2df1
Update ru.coffee
2014-03-31 15:11:56 -07:00
Alexei Nikitin
6ff8d0fbe3
Update en.coffee
2014-03-31 15:10:51 -07:00
Bia41
898018ac91
Updated pt-PT locale
...
Added some translations for European Portuguese.
2014-03-31 22:53:08 +01:00
Jazzis18
c3e4b4d279
Update ru.coffee
...
Добавил пробел в начало строки переменной join_desc_3, а то в тексте получалось слитно всё.
2014-04-01 03:34:45 +06:00
Alexei Nikitin
4c3e8671a3
Update ru.coffee
2014-03-31 13:33:22 -07:00
Alexei Nikitin
9e1e59bb3f
Update en.coffee
2014-03-31 13:32:11 -07:00
Nick Winter
a9a0a55331
Merge branch 'master' of git://github.com/dkundel/codecombat into dkundel-master
2014-03-31 12:42:53 -07:00
Dominik Kundel
725a8bc2d9
updated locales
2014-03-31 20:48:07 +02:00
Dominik Kundel
1c6aea9c1c
Merge remote-tracking branch 'upstream/master'
2014-03-31 20:35:32 +02:00
Alexei Nikitin
1719358856
Update ru.coffee
2014-03-31 11:32:01 -07:00
Nick Winter
8df80ad1bc
Merged AKeeper's ru.coffee additions, taking into account M-r-A's suggestions.
2014-03-30 13:33:21 -07:00
Nick Winter
1b92654a44
Merged.
2014-03-29 17:45:01 -07:00
Nick Winter
a79fe37ca1
Merged; made a couple tweaks.
2014-03-29 17:30:12 -07:00
Alexei Nikitin
ee5ee4bc88
Update ru.coffee
2014-03-29 17:28:44 -07:00
Dominik Maier
78c18b03b6
Merged new tips
2014-03-30 00:48:31 +01:00
Dominik Maier
fb607d06fa
Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670
2014-03-30 00:38:45 +01:00
Herbert Vojčík
f0298f4596
some more Slovak
2014-03-29 03:18:45 +01:00
Nick Winter
5e30ab091b
Updated i18n tags.
2014-03-28 13:19:17 -07:00
Nick Winter
13d5536eb3
Merged.
2014-03-28 13:08:30 -07:00
Jasper D'haene
7f6510823a
merged
2014-03-28 20:59:05 +01:00
Jasper D'haene
fa6ef5aa49
added authors to quotations
2014-03-28 19:58:33 +01:00
Jasper D'haene
cd3019296c
added tips/quotes to loading bar
2014-03-28 19:01:31 +01:00
Michael Schmatz
20c54400b8
Merge pull request #722 from dc55028/master
...
fr.coffee: fixed typos and translated glen_description
2014-03-28 09:16:35 -07:00
Michael Schmatz
e0f50d04a8
Uncomment translations
2014-03-28 09:13:08 -07:00
Dominik Kundel
35a16b47ff
Merge remote-tracking branch 'upstream/master'
2014-03-28 14:37:14 +01:00
Dom
15590252f1
Update fr.coffee
...
fixed other typos and translated a definition
2014-03-28 00:38:31 +01:00
Arni Mc.Frag
0388376d99
Update ca.coffee
2014-03-28 00:29:54 +01:00
Dom
6f02748311
Update fr.coffee
...
fixed typos
2014-03-28 00:29:31 +01:00
Darredevil
f4a81f43a2
Added funny tip
2014-03-28 00:13:30 +02:00
AKeeper
d21fbbfe4d
Update ru.coffee
2014-03-27 16:48:30 +02:00
Alexei Nikitin
780743a40d
Update ru.coffee
2014-03-26 15:57:16 -07:00
Alexei Nikitin
2ffc2efaa5
Update ru.coffee
2014-03-26 15:42:03 -07:00
Glen De Cauwsemaecker
5825b2676b
Added myself to the signature.
2014-03-26 04:46:49 +01:00
Dominik Kundel
fe8a4901de
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
app/locale/de.coffee
bower.json
2014-03-25 17:07:36 +01:00
Michael Schmatz
06f46af603
Merge pull request #688 from 1c7/master
...
Translate some word from English -> Chinese. (zh-HANS.coffee)
2014-03-25 08:44:29 -07:00
1c7
ed2e17aedc
Translate some word from English -> Chinese. (zh-HANS.coffee)
2014-03-25 23:15:17 +08:00
Glen De Cauwsemaecker
305e2f6d68
Merge pull request #685 from JasperDhaene/master
...
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
2014-03-25 13:27:13 +01:00
JasperDhaene
748081b4a7
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
2014-03-25 09:25:20 +01:00
Darredevil
4bb1ee5c74
Update ro.coffee
2014-03-25 02:55:07 +02:00
Glen De Cauwsemaecker
3382750c7e
Merge branch 'dutch_diff' of github.com:rubenvereecken/codecombat
2014-03-25 01:13:30 +01:00
Ruben Vereecken
a3f65ace7a
Created differentation between nl-BE and nl-NL
2014-03-24 22:21:34 +01:00
Glen De Cauwsemaecker
d6178aa2cc
Fixed a small error
2014-03-24 00:46:44 +01:00
Glen De Cauwsemaecker
724592601c
Merge branch 'master' of github.com:JasperDhaene/codecombat
2014-03-24 00:45:09 +01:00
JasperDhaene
58601e95f6
finished review of nl.coffee
2014-03-23 22:54:30 +01:00
JasperDhaene
e5d2c07ff1
general revision until line 254
2014-03-23 17:30:45 +01:00
Nick Winter
4c1dc0d7f9
Merge pull request #661 from M-r-A/patch-2
...
Update ru.coffee
2014-03-23 09:11:52 -07:00
Nick Winter
90832f6015
Merge pull request #653 from 3rr3s3v3n/patch-1
...
Translating Multiplayer lines
2014-03-23 09:11:11 -07:00
JasperDhaene
dde626e759
Update nl.coffee - small revisions/additions
2014-03-23 16:57:33 +01:00
Alexei Nikitin
20e111d307
Update ru.coffee
2014-03-23 07:30:14 -07:00
3rr3s3v3n
f4de280cee
Translating more Lines.
...
Password remains password in Italian, such as VS.
2014-03-23 11:53:39 +01:00