Commit graph

11621 commits

Author SHA1 Message Date
Maka
95dd067c9c Increased max thang-name-length to 60 characters 2016-05-17 23:04:46 -04:00
Dong殺布沙
f017ecd52b Update zh-HANT.coffee (#3635)
* Update zh-HANT.coffee 

2016/MAY/15th leorlf2h XarBuXar

* Update zh-HANT.coffee 

2016/MAY/15th leorlf2h XarBuXar(ingameID)
2016-05-17 20:28:18 +01:00
Olha Horobets
422f92974f Add translations (#3650) 2016-05-17 20:05:26 +01:00
Nick Winter
1c8ba6cf40 Add /SEEN URLs used in magazine ad 2016-05-17 10:50:25 -07:00
Scott Erickson
c0172c4347 Add a missing 'view' in prepaid-view.jade 2016-05-17 10:07:34 -07:00
Scott Erickson
0fb6b3095f Merge pull request #3623 from duybkict/fix-3138
Fix #3138
2016-05-17 09:54:21 -07:00
Scott Erickson
d74d75b584 Merge pull request #3626 from codecombat/improve-join-classroom
Make joining classrooms more stable
2016-05-17 09:44:32 -07:00
Scott Erickson
5065594ced Merge pull request #3648 from duybkict/fix-dev-env
Fix isProduction logic
2016-05-17 09:42:59 -07:00
Scott Erickson
700f3bcf9c Merge pull request #3649 from duybkict/fix-3158
Cleanup achievements.sass #3158
2016-05-17 09:39:20 -07:00
Imperadeiro98
c52d188b9e Fix indentation in nl-NL.coffee 2016-05-17 17:20:45 +01:00
Bram Dekker
58966d6d6d added Dutch translations (#3646) 2016-05-17 17:19:21 +01:00
Mihbo
97551aee36 Update uk.coffee (#3645)
Add translation of lines 185-233 ("code" section)
2016-05-17 17:18:40 +01:00
Elian Kamal
5862c8e21c Update he.coffee (#3640)
+ A minor update to the newly generated translations for the site.
2016-05-17 17:18:06 +01:00
Imperadeiro98
ab8d8b1cf5 Fix typo in zh-HANS.coffee 2016-05-17 17:17:06 +01:00
lazydogP
ddb4c00c58 Update translation (#3639) 2016-05-17 17:16:20 +01:00
Vladimir Ivakin
88eeb73480 Update ru.coffee (#3633) 2016-05-17 17:12:49 +01:00
Olha Horobets
1f95b1ae91 Add some translations (#3632) 2016-05-17 17:10:58 +01:00
Ana
b234295555 Update sr.coffee (#3631)
translation for code itself
2016-05-17 17:10:02 +01:00
Yuki Ueda
9385f01bba Update ja.cofee #3627 (#3630) 2016-05-17 17:09:12 +01:00
duybkict
f1e60bcba4 Merge branch 'master' into fix-3158 2016-05-17 11:10:31 +07:00
duybkict
4ccf29a7f9 clean up achievements.sass 2016-05-17 11:08:28 +07:00
duybkict
322fd2d853 fix isProduction logic 2016-05-17 09:33:00 +07:00
Scott Erickson
f6b3016d85 POST /db/classroom/-/members joins any free course instances, rather then CoursesView doing so 2016-05-16 16:47:08 -07:00
Nick Winter
e538e54d7a Re-enable sales job posting 2016-05-16 16:01:44 -07:00
Scott Erickson
c8398cb090 Fix Node 4
Importing packages which are available through other packages but not explicitly included in package.json
only works in Node >5, not Node 4.
2016-05-16 15:33:08 -07:00
Matt Lott
9ee8e04514 Redirect /hoc to match /?hour_of_code=true behavior
Both go directly to /play now
2016-05-16 14:50:34 -07:00
Scott Erickson
464c432ca6 Handle ua.Version not having a split function, log it 2016-05-16 10:42:13 -07:00
Imperadeiro98
6d5f3e236f Add i18n to new-item-view.jade 2016-05-14 21:25:01 +01:00
Nick Winter
ce9eeb0fde Market Development Representative job is filled already 2016-05-13 15:57:02 -07:00
Rob
58895470ed Unattach resize event when NewHomeView is destoryed 2016-05-13 15:46:37 -07:00
Nick Winter
f723b2155b copy-i18n-tags now adds quotes around necessary translation keys 2016-05-13 15:42:41 -07:00
Nick Winter
1744a60314 Re-add the missing quotes around the new translation keys 2016-05-13 15:33:42 -07:00
Imperadeiro98
525d22895d Update code snippets 2016-05-13 20:10:23 +01:00
Rob
dbc6f6821f No ads for now. 2016-05-13 11:26:52 -07:00
Nick Winter
ad5df3be26 Propagate i18n 2016-05-13 11:14:55 -07:00
Nick Winter
d079c29f51 Update locale interpolation format for non-English (see 747c5f29f7) like in #3613 2016-05-13 10:53:39 -07:00
JurianLock
146f57e58e Update nl-NL.coffee (#3613)
* Update nl-NL.coffee

* Update nl-NL.coffee

* Update nl-NL.coffee

* Update nl-NL.coffee
2016-05-13 10:48:41 -07:00
Catsync
16800e42ea Merge pull request #3611 from Catsync/flip-hero-logic
Default to using hero, unless self/this are present in player code
2016-05-13 13:43:41 -04:00
Cat Sync
6e11b0dcda Definitely use hero if hero is present in the user code. 2016-05-13 13:37:36 -04:00
Cat Sync
59408c0de2 Merge remote-tracking branch 'codecombat/master' into flip-hero-logic 2016-05-13 13:32:46 -04:00
Imperadeiro98
fca09ad796 Update i18n
Remove some strings that are repeated or unused
2016-05-13 15:43:12 +01:00
duybkict
b58fce5868 #3138: refactor PrepaidView 2016-05-13 18:18:17 +07:00
duybkict
61ea013caf #3138: refactor PrepaidRedeemModal 2016-05-13 18:14:17 +07:00
phoenixeliot
9cb6e99942 Add operator keywords and truth values to translations
Add and tweak code translations

Translate shortened words to complete words
2016-05-12 13:46:44 -07:00
Imperadeiro98
ff48734a52 Update pt-PT.coffee 2016-05-12 21:45:44 +01:00
Matt Lott
a062e49c50 Send teacher contact form inquires to schools support email 2016-05-12 13:22:28 -07:00
Olha Horobets
84d6ae5fe2 Add more translations (#3620)
Found better phrase for 'codecombat_is'.
Added more translations.
2016-05-12 21:18:24 +01:00
phoenixeliot
0aac07cb37 Use new template for course invite email
This uses a new template for the version with the course code added, so that
I don't have to sync up changes to the template with deploying the code to
production, and so I can test it separately in staging beforehand.
2016-05-12 13:14:20 -07:00
Rob
9bf118962f Disable Clojure and IO 2016-05-12 11:36:10 -07:00
phoenixeliot
b2cfaf3b13 Add non-URL join code to classroom invite emails 2016-05-12 11:19:05 -07:00