Commit graph

12041 commits

Author SHA1 Message Date
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
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
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
Matt Lott
8e6293824b 🐛Fix admin demo requests 7-day average 2016-05-11 11:55:46 -07:00
Matt Lott
8bc9cd5ee6 Admin teacher demo requests page
Incoming rates table
Student counts table
2016-05-11 11:52:32 -07:00
Olha Horobets
ea6d5e4867 Add some more translations (#3618)
Found a better word for 'engaging'
Added more translations
2016-05-11 19:32:28 +01:00
Matt Lott
deb4117a9c Add Close.io NCES lead data to custom fields 2016-05-11 10:21:56 -07:00
Scott Erickson
8328d955a8 Merge pull request #3616 from duybkict/fix-3158
Fix issue #3158: remove unused sass files
2016-05-11 09:58:28 -07:00
korytsya
0c62e9310d Changed slogan (#3617)
* Changed slogan

* Uncomment line
2016-05-11 15:37:22 +01:00
Imperadeiro98
acee9d7331 Correct indentation in nl-BE.coffee 2016-05-11 15:36:53 +01:00
JurianLock
225d610fbe Update nl-BE.coffee (#3614) 2016-05-11 15:35:46 +01:00
Matt Lott
ef8b11601f Move worker died to eng channel 2016-05-11 05:57:04 -07:00
duybkict
8deb172b63 remove unused sass files 2016-05-11 16:49:09 +07:00
duybkict
48b58b5348 Fix issue with i18n strings 2016-05-11 09:39:35 +07:00
duybkict
2db37c7556 Merge branch 'master' into fix-1874 2016-05-11 09:18:02 +07:00
Rob
913565397b Allow passing languages into verifier. 2016-05-10 15:21:02 -07:00
Matt Lott
b604060bc7 Add call tasks to inbound leads after 3 days 2016-05-10 14:40:48 -07:00
Matt Lott
7982188e30 Script to find users with incorrect role based on classrooms 2016-05-10 14:40:48 -07:00
Rob
c6392e0f74 Turn on esper 2016-05-10 14:12:35 -07:00
Cat Sync
50c8588231 Default to using hero unless self/this is present in the player's code.
This affects the autocomplete and spell palette api docs.
2016-05-09 12:49:25 -04:00
Scott Erickson
c707129b5e Disable esper, LevelSession.state.dateFirstCompleted schema restriction 2016-05-09 09:32:51 -07:00
Cat Sync
0edd8af1db Merge remote-tracking branch 'codecombat/master' 2016-05-09 09:40:53 -04:00
Nick Winter
2faca0419b Fix another error I saw in the logs 2016-05-08 20:59:58 -07:00
Nick Winter
d0be5c1f22 Handle a couple errors I saw in the logs 2016-05-08 10:05:26 -07:00
Duy Trần
4172f03fad Vi translation (#3609)
* Translate into Vietnamese

* Translate and edit some Vietnamese strings

* update Vietnamese translate

* try to fix some error

* fix bugs with tab character

* update vi.coffee: play_level

* Update vi.coffee

* update vi.coffee

* update text on Home page

* Vietnamese: update legal

* vi.coffee: edit community page

* vi.coffee: update user's page

* vi.coffee: about page

* update vi.coffee

* update vi.coffee

* vi.coffee: invoices

* vi.coffee: account_prepaid

* update vi.coffee

* vi.coffee: error strings

* Update vi.coffee

* update vi.coffee

* vi.coffee: update contact form

* vi.coffee: minor update

* vi.coffee: update about page, modify some strings
2016-05-07 10:16:39 +01:00
phoenixeliot
ec8bce9f70 Put back clobbered pt-PT code translations 2016-05-06 15:26:21 -07:00