Commit graph

12701 commits

Author SHA1 Message Date
Matt Lott
726ad525fa Remove add students from /teacher/classes
No longer make sense after add students dialog UI update.
2016-08-19 13:32:17 -07:00
Imperadeiro98
b21cfe55cb Fix i18n of cast-button-view.jade 2016-08-19 17:56:05 +01:00
Scott Erickson
dbf63e250c Add realtime keyboard events for game dev 2016-08-19 09:44:36 -07:00
Lucas P
de739bb6db Translation PT-BR (#3861)
Just  an small update.
Will do more!
2016-08-19 17:06:00 +01:00
Matt Lott
b280e6ff79 Find invalid courses script 2016-08-18 18:36:31 -07:00
Matt Lott
d6d208803c Undefined check on homepage, update updateCourses.js 2016-08-18 18:36:31 -07:00
Phoenix Eliot
dc7c220b57 Add goal checking on user clicks 2016-08-18 16:40:48 -07:00
Matt Lott
fb0357e0f9 Remove duplicate course entries from updateCourses.js 2016-08-18 15:27:06 -07:00
Nick Winter
1de03cce15 Merge branch 'master' into production 2016-08-18 15:04:48 -07:00
Nick Winter
2f220eb007 Fix #3843 2016-08-18 14:39:14 -07:00
Phoenix Eliot
dc888fb3a1 Merge branch 'master' into production 2016-08-18 14:12:02 -07:00
Phoenix Eliot
c33f86768a Translate level wrapper code 2016-08-18 14:09:34 -07:00
Imperadeiro98
605169e792 Update pt-PT.coffee 2016-08-18 22:06:39 +01:00
Nick Winter
0364463f99 Propagate i18n 2016-08-18 13:50:34 -07:00
Nick Winter
37d94b8a1c Merge branch 'lazydogP-master' 2016-08-18 13:47:59 -07:00
Nick Winter
8fbf9983d5 Fix zh-HANS.coffee merge 2016-08-18 13:47:51 -07:00
Nick Winter
a5be5feb85 Merge branch 'master' of github.com:codecombat/codecombat 2016-08-18 13:41:15 -07:00
Nick Winter
1f9ecfc7a8 Merge branch 'dungkunit-patch-1' 2016-08-18 13:41:06 -07:00
Nick Winter
f749938800 Fix vi.coffee merge 2016-08-18 13:40:49 -07:00
Imperadeiro98
5dd746af4a Small change to select hero wording 2016-08-18 21:39:54 +01:00
Nick Winter
ee168e9313 Merge branch 'VilkkuV-patch-1' 2016-08-18 13:39:13 -07:00
Nick Winter
54d45cbfbf Fix fi.coffee merge 2016-08-18 13:39:03 -07:00
Scott Erickson
04ce4e82e2 Merge branch 'master' into production 2016-08-18 13:33:10 -07:00
Scott Erickson
300c81e72b Course translations fixes
* Restrict patch handling properly
* Fix #3860, CS 2 description
* i18nCoverage is updated when new translations are auto-accepted
* Course patches are listed on PendingPatchesView properly
* 'Artisan' permission allows editing course translations
2016-08-18 13:29:52 -07:00
Scott Erickson
af6b3499e2 Merge branch 'master' into production 2016-08-18 10:18:27 -07:00
Scott Erickson
d4af931e05 Add course (name, description) translations 2016-08-18 10:10:18 -07:00
Matt Lott
f61f14571f Remove CS: prefixes, add game-dev-2 course 2016-08-18 09:57:09 -07:00
Yuki Ueda
bd5a453b7f Update ja.coffee (#3859) 2016-08-18 17:32:46 +01:00
Matt Lott
720e7ea897 Update beta campaign world selector images 2016-08-17 21:14:11 -07:00
Matt Lott
f44821bfe1 🐛Fix admin student licenses range coloring 2016-08-17 21:08:23 -07:00
Phoenix Eliot
98e6347268 Merge branch 'master' into production 2016-08-17 16:54:59 -07:00
Phoenix Eliot
6b1adb9b31 Turn off emails to Josh about timeouts 2016-08-17 16:54:37 -07:00
Imperadeiro98
15b795b855 Update pt-PT.coffee 2016-08-17 22:32:41 +01:00
Matt Lott
713ad8115a Merge branch 'master' into production 2016-08-17 14:26:17 -07:00
Matt Lott
46e05e893b Redirect students and teachers on sign in
Closes #3857
2016-08-17 14:17:16 -07:00
Matt Lott
b647252956 Update /courses UI 2016-08-17 14:15:52 -07:00
Nick Winter
accb7aa149 Merge branch 'master' into production 2016-08-17 12:06:17 -07:00
Nick Winter
01affc2054 Fix bug in premium level selection code 2016-08-17 12:05:31 -07:00
Matt Lott
b057168e61 Update add students dialog
Updating copy, removing everything except email inviting
2016-08-17 11:10:48 -07:00
Nick Winter
467ba12584 Merge branch 'master' into production 2016-08-17 10:02:58 -07:00
Nick Winter
6e4cd57d44 Propagate i18n 2016-08-17 10:02:36 -07:00
Nick Winter
8ec17265dc Give China server all free levels but hide paid levels (#3855)
* Give China server all free levels but hide paid levels

* Don't prompt to buy gmes on free-only server on insufficient gems for item/hero purchases
2016-08-17 10:00:56 -07:00
Matt Lott
2c2c052d5a 🐛Fix course slug check for /teachers/courses tests 2016-08-16 17:08:47 -07:00
Matt Lott
84e3ee270a Add primer level support to classroom Ux
Exclude levels if classroom.aceConfig.language == level.primerLanguage

Closes #3856
2016-08-16 16:52:17 -07:00
Matt Lott
efa4b2b158 🐛Fix teacher dashboard course # progress 2016-08-16 16:30:12 -07:00
Matt Lott
8054cd6cf0 Update gd1 course to released 2016-08-16 15:27:34 -07:00
Phoenix Eliot
f076b09686 Merge branch 'master' into production 2016-08-16 13:59:16 -07:00
Phoenix Eliot
a1b012c7f5 Add support for optional arguments, and web components
Refactor

Don't use globals in template
2016-08-16 13:43:08 -07:00
Rob
07f6f98c24 Refactor remote server readpref and connection strings. 2016-08-16 13:35:15 -07:00
Phoenix Eliot
7becb1db45 Merge branch 'master' into production 2016-08-16 11:31:42 -07:00