Commit graph

12083 commits

Author SHA1 Message Date
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
b61e504a83 Merge branch 'master' into production 2016-05-16 14:50:53 -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
Olha Horobets
7ff302ef48 Add translations 2016-05-15 20:35:23 +03: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
4fc0cf9b0e Merge branch 'master' into production 2016-05-12 13:16:19 -07: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
dcc0720997 Merge branch 'master' into production 2016-05-12 11:28:02 -07:00
phoenixeliot
b2cfaf3b13 Add non-URL join code to classroom invite emails 2016-05-12 11:19:05 -07:00
Matt Lott
a208a514d2 🐛Add null check to sub_sponsor endpoint
Causes exception when sponsor has deleted their account.
2016-05-12 11:03:35 -07:00
Matt Lott
bc928253a5 Add site origin to demo requests admin page 2016-05-12 11:03:35 -07:00
Matt Lott
b8dd0f0a45 Filter out low priority sales leads on initial import 2016-05-12 11:03:35 -07:00
duybkict
672c89e0bc Update Vagrant setup scripts
install nodejs using nvm
fix issues with Windows/Linux new line characters
update auto-reload-brunch
drop bless-brunch
resolve related issue #3588
2016-05-12 09:46:34 -07:00
Scott Erickson
0770a61534 Merge pull request #3608 from duybkict/fix-1874
fix issue #1874
2016-05-12 09:11:39 -07:00
duybkict
2a5968e001 no message 2016-05-12 09:10:54 +07:00
Rob
f01e7803c8 Merge branch 'master' into production 2016-05-11 16:14:43 -07:00
Rob
f5c1b6c35c Disable Clojure and IO 2016-05-11 16:14:23 -07:00
phoenixeliot
05ae7057db Fix class joining when entering it in the signup field 2016-05-11 14:53:05 -07:00
phoenixeliot
35d0352a92 Autofill class code from URL in signup modal 2016-05-11 14:53:05 -07:00
Rob
57768459bd Merge branch 'master' into production 2016-05-11 14:28:39 -07:00
Matt Lott
8e6293824b 🐛Fix admin demo requests 7-day average 2016-05-11 11:55:46 -07:00