codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
12297 commits 27 branches 0 tags 134 MiB
Commit graph

12297 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Matt Lott
8054cd6cf0 Update gd1 course to released 2016-08-16 15:27:34 -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
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
Matt Lott
7cd49b438b Update ZP -> Close lead importing to only query for last 30 days 2016-08-16 05:28:50 -07:00
lazydogP
2e0a7769ac Update zh-HANS.coffee 2016-08-16 07:33:15 +08:00
lazydogP
931103e4a4 Merge remote-tracking branch 'refs/remotes/codecombat/master' 2016-08-16 07:32:33 +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
f49305bd9d Update wd1 to released 2016-08-15 13:47:24 -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
Scott Erickson
a5f18f88be Add script that migrates users with email-formatted usernames 2016-08-12 14:34:08 -07:00
Phoenix Eliot
76e461398e Clean up i18n TODOs 2016-08-12 13:27:30 -07:00
Phoenix Eliot
31a3f9dff8 Clean up console.log in server tests 2016-08-12 13:25:11 -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
Matt Lott
f96c3ab00e 🐛Fix course instance server test day range bugs 2016-08-11 22:46:15 -07:00
Matt Lott
5a6bed96b2 🐛Fix course solutions level ordering 2016-08-11 22:26:47 -07:00
Phoenix Eliot
e91a15338e Add View Project buttons to /courses 2016-08-11 16:38:14 -07:00
Matt Lott
341154ab31 🐛Fix course description typo 2016-08-11 16:03:56 -07:00
Matt Lott
0f00ae1718 Disable supermodel timeout handling tests 2016-08-11 15:36:52 -07:00
Matt Lott
2905563729 🐛Remove semi-colons from course solutions view 2016-08-11 15:34:39 -07:00