codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-13 17:21:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
12513 commits 27 branches 0 tags 134 MiB
Commit graph

9221 commits

Author SHA1 Message Date
Imperadeiro98
cc2bf8ebd9 Some fixes to pt-BR 2016-08-27 12:12:55 +01:00
Abimael Alcebíades
7a2911951c Update pt-BR.coffee (#3885) 
* Update pt-BR.coffee

translations updated

* Update pt-BR.coffee

Updated translations
 2016-08-27 12:11:14 +01:00
Robin Yang
d6d8d84722 Update formatting on CS2 Guide 2016-08-26 16:53:28 -07:00
Matt Lott
a700a00c94 Autocomplete game. 
And don’t create duplicate entries for hero. autocompletes

Closes #3883
 2016-08-26 15:10:22 -07:00
Matt Lott
b8d4e51331 Add line endings and newlines for fuzzy autocompletes 
Closes #3351
 2016-08-26 10:32:56 -07:00
Josh Callebaut
e54cd7c05f Merge pull request #3881 from Zerrien/intro-view 
View for tracking Intro/Overview guide issues
 2016-08-25 16:53:38 -07:00
Josh Callebaut
ff00091408 Tweaks based on CR from Rob 2016-08-25 15:52:49 -07:00
Josh Callebaut
cb41100d2e Style-fix quotes and EOD newlines 2016-08-25 15:37:49 -07:00
Josh Callebaut
53e68a79a6 Add a page for tracking intro/guide issues 2016-08-25 15:31:24 -07:00
Matt Lott
9553238a64 🐛Fix adjacent campaign map arrows 2016-08-25 10:40:07 -07:00
Josh Callebaut
f5770c3a2a Merge pull request #3878 from Zerrien/adv-color-2 
Adventurer levels lose star and become purple
 2016-08-25 10:38:27 -07:00
Nick Winter
878dcbdc49 Better handling of non-user-code problems in game-dev mode. Don't simulate whole level first time a game-dev level is loaded. 2016-08-24 15:21:09 -07:00
Josh Callebaut
18e985a845 No longer display star on adventurer levels and make all adventurer levels purple 2016-08-24 14:35:26 -07:00
Robin Yang
8435789691 Change programming language listing on About page 2016-08-24 14:02:03 -07:00
Matt Lott
f391030b44 Add hints test group distinction comments 2016-08-24 12:05:40 -07:00
Matt Lott
22e3f445c0 Add achievement hidden property 2016-08-24 07:37:11 -07:00
Rob Blanckaert
d9b688c5b8 Merge pull request #3874 from codecombat/course-curriculum 
Create Markdown for CS1, CS2 Curriculum
 2016-08-23 18:16:19 -07:00
Rob
5c6fb20d7f Add back to top buttons. 2016-08-23 18:12:44 -07:00
Robin Yang
b550aae76a Remove target grades from Curriculum 2016-08-23 16:07:10 -07:00
Robin Yang
c3b3c6ea2a Update Student License requirement copy 2016-08-23 16:05:16 -07:00
Nick Winter
bfa49cbbc6 Fix sending too much and not enough data on arena sessions 2016-08-23 16:02:03 -07:00
Robin Yang
52c1f3d625 Add CS1, CS2 to Resource Hub 
Also adding additional worksheets/PDFs.
 2016-08-23 14:46:02 -07:00
Robin Yang
5d31496ceb Update CS1, CS2 curriculum content 2016-08-23 14:45:32 -07:00
Scott Erickson
09a9358b9e Modify courses i18n edit view to be less error-prone 
* Do not use 'backup' system
* Warn when about to lose changes
* Show list of patches and their statuses
 2016-08-23 14:36:45 -07:00
Scott Erickson
ae28223b96 Add course edits stats properties to user schema 2016-08-23 13:34:19 -07:00
Scott Erickson
7d9d42a23f Fix i18nCoverage bug 
Sometimes, translations is undefined, so check that it exists
 2016-08-23 13:33:51 -07:00
Scott Erickson
24848da7bf Fix scrolling on PlayGameDevLevelView 2016-08-23 12:50:50 -07:00
Phoenix Eliot
e929686502 Enable session spectating for WebDev levels 2016-08-23 11:48:02 -07:00
Phoenix Eliot
209b7d724e Fix webdev for china server 2016-08-23 11:08:57 -07:00
Scott Erickson
ef0547f72a Simplify applying licenses 
In TeacherClassView, when a teacher assigns a paid course to any unenrolled
student, the view automatically enrolls those students, rather than requiring
the teacher to enroll those students manually first. Update copy throughout.

Also add back (smaller) padding to progress dots in TeacherClassView.
 2016-08-23 10:43:31 -07:00
Matt Lott
c2ae4d3748 Add gd2 and wd2 to individual game 
Closes #3875
 2016-08-23 10:15:47 -07:00
Robin Yang
f8caa86579 Move resource templating from coffee to jade files 2016-08-23 09:38:11 -07:00
Scott Erickson
382304a256 Merge pull request #3869 from kdparkinson/master 
Thang name contributions
 2016-08-23 09:10:49 -07:00
Matt Lott
2584124017 Add array option to adjacentCampaigns.showIfUnlocked 2016-08-23 05:42:23 -07:00
Kenny Parkinson
2642dc896f Removed duplicate Anya 2016-08-22 19:14:55 -06:00
Robin Yang
fe3b9e01e0 Create Markdown for both CS1, CS2 Curriculum 2016-08-22 17:33:49 -07:00
Phoenix Eliot
3d8d0b96d3 Make popover pins stickier 2016-08-22 13:29:35 -07:00
Phoenix Eliot
b4fe0a3bee Fix SpellPaletteView's popover Ace 2016-08-22 13:23:52 -07:00
Phoenix Eliot
7f2d3d8b57 Fix iFrame being truncated 2016-08-22 12:01:48 -07:00
Scott Erickson
136d274d54 Render from partially-completed prerendered spritesheet correctly, fix #3641 2016-08-22 11:45:43 -07:00
Matt Lott
0cef562d9b Update subscription dialog blurbs 2016-08-22 11:29:30 -07:00
Matt Lott
61be34a0f4 Sort courses in teacher ux 
Closes #3870
 2016-08-22 11:18:26 -07:00
Matt Lott
7c9f7cbce7 Show correct programming language in level intro 2016-08-22 06:11:01 -07:00
Matt Lott
f2597229b5 No autocomplete x y, rename Zatanna to Autocomplete 
Don’t autocomplete common variables ’x’ or ‘y’:
return if /^x$|^y$/i.test(prefix)
Renaming zatanna to autocomplete

Closes #3865
 2016-08-22 05:46:07 -07:00
Kenny Parkinson
c1e9730499 added klondike as name for Polar Bear Pet #53 2016-08-20 09:39:05 -06:00
Kenny Parkinson
023a0e9ca8 Added 'Anya' as a female pixie. 2016-08-20 09:17:21 -06:00
Robin Yang
2b586420f3 Add i18n for Resource Hub 2016-08-19 17:42:02 -07:00
Robin Yang
611368f742 Add Resource Hub to teacher dashboard 2016-08-19 17:41:06 -07:00
Scott Erickson
c595183177 Remove teacher class view progress dot padding 2016-08-19 16:47:25 -07:00
Matt Lott
05159ff7c2 Support course slugs that match course names 
Must be backwards compatible until we update the course slugs.

Closes #3867
 2016-08-19 16:05:37 -07:00
Scott Erickson
acfe62a786 Merge pull request #3868 from codecombat/course-progress-projects 
Add project/arena pills to course progress tab to TeacherClassView
 2016-08-19 16:05:09 -07:00
Scott Erickson
aeddfe77d6 Add project/arena pills to course progress tab to TeacherClassView 
Also remove templating for deprecated progress tab
 2016-08-19 15:48:45 -07:00
Matt Lott
cfcda2bd00 🐛Update no students text in class view 2016-08-19 15:06:25 -07:00
Matt Lott
d392f7780e Force level primer language usage for students 2016-08-19 14:26:39 -07:00
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
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
Nick Winter
2f220eb007 Fix #3843 2016-08-18 14:39:14 -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
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
Matt Lott
e65dc8e2a5 Update homepage anonymous CTA buttons 
I’m a Teacher -> /teachers/signup
I’m a Student -> /home#create-account-student
 2016-08-10 13:14:41 -07:00
Scott Erickson
2e5c15cc6d Internationalize student UI for game dev levels 2016-08-10 12:47:34 -07:00
Scott Erickson
ff2d505720 Internationalize PlayGameDevLevelView 2016-08-10 12:47:34 -07:00
Scott Erickson
ffa840910d Do not automatically show victory modal for shareable game dev levels 
Students are likely to want to keep working on their level, even if
they beat it.
 2016-08-10 12:47:34 -07:00
Matt Lott
d14bea3110 Add hero. autocomplete entries 
Adding up to 10 highest importance hero. duplicate autocomplete entries
that include ‘hero.’
Increasing max suggestions allowed from 10 to 20
 2016-08-10 11:17:56 -07:00
Scott Erickson
9b992a8679 Merge pull request #3823 from Imperadeiro98/master 
Fix #2844
 2016-08-10 09:46:20 -07:00
Abimael Alcebíades
54ec028962 added new translations (#3834) 2016-08-10 09:17:52 +01:00
Nguyễn Việt Dũng
65e7aa358b Update vi.coffee 2016-08-10 10:16:27 +07:00
Abimael Alcebíades
40aa30d161 Update pt-BR.coffee (#3830) 2016-08-09 21:17:11 +01:00
Bram Dekker
c620d29755 Update nl-NL.coffee (#3829) 
translated some lines in the signup section.
 2016-08-09 21:16:25 +01:00
Glubu
d3b56b3e97 typo and punctuation fixed (#3817) 2016-08-09 21:15:43 +01:00
Matt Lott
6a8776c31b 🐛Add parent blurb to signup birthdate check 2016-08-09 06:33:15 -07:00
Matt Lott
a00f2600f6 🐛Show API docs popovers higher over surface 2016-08-09 06:03:58 -07:00
Matt Lott
5fc88ebeeb 🐛Fix extra space in he.coffee 2016-08-09 05:38:35 -07:00
VilkkuV
7188822552 Update fi.coffee 2016-08-09 10:26:01 +03:00
themaka
f111c16482 Add Sean to /about (#3826) 
* Add Sean to /about

* Remove empty line
 2016-08-08 17:46:22 -07:00
phoenixeliot
5b8d66cd1c Add hero selector to create account modal 
Don't show grey border around Anya in signup modal

Refactor reload handling

Fix courses page updating to chosen hero
 2016-08-08 15:19:44 -07:00
Nick Winter
6b49d4ccf6 Propagate he.coffee 2016-08-08 15:18:57 -07:00
Nick Winter
3ff34b376f Manually merge #3825: add Hawaiian 2016-08-08 13:10:28 -07:00
wyyi
f3ffaf5e34 Update uk.coffee (#3824) 2016-08-08 20:48:24 +01:00
borispinatel
5a077e628d Update fr.coffee (#3801) 2016-08-08 20:47:34 +01:00
Scott Erickson
51b292cc3d Add static messages to game dev levels for playtesting 2016-08-08 11:49:38 -07:00
VilkkuV
2e8a395349 Update fi.coffee 2016-08-08 21:44:39 +03:00
VilkkuV
a32d32674a Update fi.coffee 2016-08-08 20:48:30 +03:00
Imperadeiro98
d76a81438d Remove dead line from ArticleEditView template 2016-08-07 19:13:31 +01:00
Imperadeiro98
9df2c97923 Fix #2844 2016-08-07 19:02:51 +01:00
Nora Kenez
57b7791286 Update hu.coffee (#3813) 
* Update hu.coffee

* Update hu.coffee
 2016-08-07 15:40:25 +01:00
Imperadeiro98
cc24d962c5 Fix systems documentation tab background 
Same as #3794
 2016-08-07 15:35:42 +01:00
Phoenix Eliot
6697d33681 Fix level editor child window size 
Makes it slightly larger at 1280x640, which is our target screen size
for slightly smaller than chromebook screens.
 2016-08-05 16:16:09 -07:00
Matt Lott
6f08d5e422 Add required district field to teacher trial request forms 
School now optional
N/A placeholder on district field and don't save it if it's n/a
Updating required field error UI a bit, and there is some larger
refactoring needed here later.
NCES phone number for district only entries will currently be a child
school, will fix later.

Closes #3818
 2016-08-05 13:25:19 -07:00
Scott Erickson
f4c0e4144e Add some comments and a TODO for the supermodel retrying system 2016-08-05 13:23:44 -07:00
Scott Erickson
2287c4f1e5 Merge pull request #3811 from themaka/master 
Adding Croatian and Māori to languages
 2016-08-05 13:04:47 -07:00
themaka
175d8a9983 Comment out the "common" 
Which I've learned is not used until someone's actually translated
something in that section ...
 2016-08-05 15:11:15 -04:00
Matt Lott
8b8086a95d 🐛Fix admin classrooms levels page campaign lookup 2016-08-05 12:09:36 -07:00
Scott Erickson
960d296dd1 Merge pull request #3816 from matt-sanders/background_fixes 
fixes #3796 #3794 #3793
 2016-08-05 10:33:33 -07:00
Catsync
adda9747e9 Add a value 'hidden' for campaign's type property (#3819) 
Nick would have to manually remove the defaulted ‘hero’ type from new
campaigns to make sure it wasn’t included in various campaign related
queries until we were ready. Now we can set this to hidden in the
campaign editor.
 2016-08-05 10:31:46 -07:00
Matt Sanders
ef7b9aa3aa fixes #3794 by not making everything 100% height 2016-08-05 17:12:18 +12:00
Matt Sanders
95146e7820 fixed the background issue on the tasks tab 2016-08-05 17:02:22 +12:00