Commit graph

9059 commits

Author SHA1 Message Date
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
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
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
54d45cbfbf Fix fi.coffee merge 2016-08-18 13:39:03 -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
d4af931e05 Add course (name, description) translations 2016-08-18 10:10:18 -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
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
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
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
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
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
Phoenix Eliot
fd45c9d473 Implement HeroSelectModal for demo flow
Add Campaign factory

First basic tests for HeroSelectModal in demo flow

Implement HeroSelectModal for demo flow

Improve tests

Disable empty test

Fix text inconsistency around 'me'

Just listen once

Add HeroSelectModal events test

Don't reuse destroyed modal

Fix inconsistent modal close behavior

Fix tests
2016-08-16 11:19:40 -07:00
lazydogP
2e0a7769ac Update zh-HANS.coffee 2016-08-16 07:33:15 +08:00
Scott Erickson
b471b909c5 Disable projects tab 2016-08-15 15:04:05 -07:00
Matt Lott
f84897eaa7 Update home course tiles 2016-08-15 14:41:09 -07:00
Matt Lott
e62dbed362 Shift user code yellow arrow tips inward based on indentation
Closes #3850
2016-08-15 13:36:43 -07:00
Rob
b308da0473 Add analytics even for LevelLoad errors. 2016-08-15 13:34:06 -07:00
Scott Erickson
e9c7edb6be Fix populate i18n to also populate thang component configs 2016-08-15 11:54:04 -07:00
iammehmetguler
803fc39998 Update tr.coffee (#3842)
* Update tr.coffee

calendar

* Update tr.coffee

login, signup
2016-08-13 11:26:39 +01:00
Phoenix Eliot
c2ce804839 Fix worker-based syntax annotations 2016-08-12 16:28:29 -07:00
Scott Erickson
2dadc8458c Remove hardcoded student ui game dev play instructions 2016-08-12 14:38:32 -07:00
Phoenix Eliot
76e461398e Clean up i18n TODOs 2016-08-12 13:27:30 -07:00
Phoenix Eliot
73bbe598da Improve WebDev level image gallery
Improve image gallery

Add How to Copy/Paste section

Fix modal close button

Add specs for image gallery

Fix up i18n

Fix render resetting scroll

Address code review feedback

Ensure afterRender is called
2016-08-12 13:19:26 -07:00
Phoenix Eliot
e91a15338e Add View Project buttons to /courses 2016-08-11 16:38:14 -07:00
Matt Lott
2905563729 🐛Remove semi-colons from course solutions view 2016-08-11 15:34:39 -07:00
Matt Lott
a7e290fffe Replace course guide PDFs with solutions pages 2016-08-11 15:29:56 -07:00
Zeldaretter
5fc184da67 Update de-De.coffee (#3838)
some translations
2016-08-11 22:13:03 +01:00
iammehmetguler
e21217dad3 Update tr.coffee (#3837)
calendar
2016-08-11 21:29:23 +01:00
Scott Erickson
d679700966 Disable SuperModel retrying
Seems to be causing issues when requests retry with different parameters,
for example:

https://github.com/codecombat/codecombat/blob/master/app/views/NewHomeView.coffee#L42-L45

This retries without the original GET parameters and returns a 403 as a result.
2016-08-11 09:44:36 -07:00
Scott Erickson
37d0b23103 Merge pull request #3835 from Imperadeiro98/master
Remove obsolete ErrorView from templates
2016-08-11 08:30:42 -07:00
Matt Lott
eaddf2fa8d Add level schema primerLanguage
For web-dev 2 course in the short term
2016-08-11 06:08:58 -07:00
Abimael Alcebíades
1436b6e2a3 Update pt-Br.coffee (#3836)
added new translations
2016-08-11 11:12:09 +01:00
Phoenix Eliot
a4f48bbc17 Add tests for SuperModel load retrying
Clear timeouts after each test
2016-08-10 15:28:33 -07:00
Phoenix Eliot
d3db19dee3 Report timeout problems, and fix retries
Fix getting model URLs
2016-08-10 15:28:25 -07:00
Matt Lott
c87f505759 Add gd1 and wd1 to campaign world Ux
Add 1st game-dev and web-dev campaigns to world selector
Take player back out to world selector after completing campaigns up through forest

Closes #3828
2016-08-10 15:06:14 -07:00
Matt Lott
2e5f9abd97 🐛Fix autocomplete suggestion limit comment 2016-08-10 14:45:59 -07:00
Imperadeiro98
4b4c19928f Remove obsolete ErrorView from templates 2016-08-10 21:15:38 +01:00