Commit graph

11460 commits

Author SHA1 Message Date
Matt Lott
8deea61be8 Update account restricted copy 2016-04-28 09:42:17 -07:00
Scott Erickson
997fe1aafb CoursesView uses regular login and create account modals 2016-04-27 16:26:05 -07:00
Matt Lott
7b88eb0250 Remove Clojure from /about and play modals 2016-04-27 16:15:27 -07:00
Scott Erickson
7788608d2d Navbars collapse below large screen sizes 2016-04-27 16:07:55 -07:00
Matt Lott
cdddc24693 Add user.ageRange enum values update note 2016-04-27 15:23:03 -07:00
Nick Winter
89db933c90 Change wording on enrollment purchase page for larger purchases 2016-04-27 14:17:53 -07:00
Scott Erickson
2aa0b35c6e Fix server running on Node 4
Node 5 doesn't care whether you explicitly list co in the list of dependencies,
when it's a dependency of co-express. But Node 4 does.
2016-04-27 14:07:41 -07:00
phoenixeliot
84ec2d630f Make some Course materials teacher-only on dashboard 2016-04-27 13:24:54 -07:00
phoenixeliot
1999b41ff3 Don't convert to teacher automatically in EnrollmentsView 2016-04-27 13:20:19 -07:00
Scott Erickson
edea13483a Fix classroom courses temporary population
Can't count on toObject getting called, such as on the '/db/classroom/:handle/levels', which
gets the courses property directly. Use middleware instead.
2016-04-27 13:19:41 -07:00
Imperadeiro98
9433cefcdc Merge pull request #3579 from i32ropie/master
Update es-ES.coffee
2016-04-27 18:21:04 +01:00
Imperadeiro98
404171fd23 Merge pull request #3582 from KonstantinLA/patch-3
Update ru.coffee
2016-04-27 18:07:32 +01:00
Imperadeiro98
de23d178c2 Merge pull request #3578 from ana-esova/patch-1
Update sr.coffee
2016-04-27 18:04:27 +01:00
Scott Erickson
675e3290ac Lock course content to classrooms 2016-04-27 09:58:04 -07:00
KonstantinLA
17fa7226e5 Fix build error 2016-04-27 16:06:21 +03:00
KonstantinLA
6868f1f7e4 Fix placeholder for the subscribe module 2016-04-27 15:52:59 +03:00
KonstantinLA
8000cdc139 Update ru.coffee
Added russian translation. 
Some fixes
2016-04-27 15:34:06 +03:00
phoenixeliot
c9ed76471a Add bad translations to Portuguese for testing purposes 2016-04-26 16:37:47 -07:00
phoenixeliot
7c1059bffa Fix code review feedback
Fix code review feedback (2)

Fix code review feedback (3)
2016-04-26 16:37:36 -07:00
phoenixeliot
66f99dd834 Add translation tooltips for code
Tweak tooltips, add some translation keys

Fixed not showing translations for English-speakers

Remove comment
2016-04-26 16:37:07 -07:00
phoenixeliot
aa93a3ec6c Translate spell type (function/method/snippet/etc) 2016-04-26 16:37:06 -07:00
phoenixeliot
02d833639b Make LevelComponent names translatable, show spell name translations in doc tooltips 2016-04-26 16:37:06 -07:00
Rob
70999fa150 Track when COPPA dialog is shown. 2016-04-26 16:31:51 -07:00
Rob
4e630362ce - Switch to flat modal
- Diffuse test time bomb
2016-04-26 14:35:07 -07:00
Rob
5bd8f7a1cb COPPA tests. 2016-04-26 14:01:03 -07:00
Rob
4183764b61 Add birthday field to user that rejects users under 13 on signup. 2016-04-26 14:00:49 -07:00
Josh Callebaut
fdc3c0d0d4 Remove dev-feed from level change messages 2016-04-26 13:00:15 -07:00
Matt Lott
283c874496 Update /privacy COPPA section 2016-04-26 11:20:47 -07:00
Josh Callebaut
c6cbcd4777 Merge pull request #3395 from Zerrien/spade
Implements Spade functionality, and adds the sublime project file.
2016-04-26 11:15:17 -07:00
Matt Lott
49c1dd8cf7 Update lead status values for Close.io inbound inserts 2016-04-26 10:31:12 -07:00
Josh Callebaut
c4652d82e2 Implements the SPADE logger into the SpellView
* Updates spade.js vendor file, adds a sublime-project for developers to use
* Moves server logic away from handlers
* Moves session update logic to middleware, sets up server schema to autorender IDs as ObjectIDs
* Modernizes the supermodel loading scheme and switches from constructor to initalize
2016-04-26 09:56:30 -07:00
Scott Erickson
3c715ceba8 Merge pull request #3562 from edtrist/PauseModalVideo
Pause help videos when guide modal is not visible
2016-04-26 09:39:12 -07:00
Eduardo Roldan
0c49e9d175 Update es-ES.coffee 2016-04-26 14:37:46 +02:00
Nick Winter
e4392019a4 Fix console.warning -> console.warn typo 2016-04-25 17:25:30 -07:00
Nick Winter
e96f4651f2 Add basic listening for code problems to Verifier 2016-04-25 17:03:08 -07:00
edtrist
405fbeabf8 use view jquery 2016-04-25 22:19:28 +01:00
Scott Erickson
e8d0ec08cb Merge pull request #3572 from UltCombo/i18n-subscription-modal
Update subscribe modal's style to support i18n, fixes #3526
2016-04-25 13:22:18 -07:00
Scott Erickson
1e2c84f09c Merge branch 'UltCombo-i18n-subscription-modal-interpolate' 2016-04-25 12:30:14 -07:00
Scott Erickson
92f58b29b0 Merge branch 'i18n-subscription-modal-interpolate' of https://github.com/UltCombo/codecombat into UltCombo-i18n-subscription-modal-interpolate 2016-04-25 12:28:46 -07:00
Ana
cd9c2dfccb Update sr.coffee 2016-04-24 21:56:46 +02:00
Ana
51a3eee697 Update sr.coffee
Translated more sections and fixed some previous lines~
2016-04-24 21:45:09 +02:00
Imperadeiro98
814c78be8b Uncomment headers from sr.coffee 2016-04-24 14:45:08 +01:00
Imperadeiro98
582abb0d87 Merge pull request #3568 from ana-esova/patch-1
Update sr.coffee
2016-04-24 14:42:42 +01:00
Imperadeiro98
4fe258fe7f Merge pull request #3576 from KonstantinLA/patch-2
Update ru.coffee
2016-04-24 14:41:10 +01:00
Imperadeiro98
b17c0b9785 Merge pull request #3575 from UltCombo/i18n-pt-br-newhome
i18n pt-BR: add and improve some `new_home` translations
2016-04-24 14:40:24 +01:00
Imperadeiro98
53f1216878 Merge pull request #3573 from Ikuyadeu/patch-1
Update ja.coffee
2016-04-24 14:39:18 +01:00
Imperadeiro98
a5a56f5085 Merge pull request #3569 from JurianLock/patch-9
Update nl-NL.coffee
2016-04-24 14:38:25 +01:00
Imperadeiro98
31d42f3132 Merge pull request #3567 from KonstantinLA/patch-1
Update ru.coffee
2016-04-24 14:36:58 +01:00
KonstantinLA
a7cb7a6207 Update ru.coffee
Added russian translation
2016-04-24 14:13:53 +03:00
UltCombo
fdb8b4ffeb i18n pt-BR: add and improve some new_home translations 2016-04-24 02:41:31 -03:00