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

2422 commits

Author SHA1 Message Date
Robin Yang
c3b3c6ea2a Update Student License requirement copy 2016-08-23 16:05:16 -07:00
Robin Yang
52c1f3d625 Add CS1, CS2 to Resource Hub 
Also adding additional worksheets/PDFs.
 2016-08-23 14:46:02 -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
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
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
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
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
Matt Lott
d6d208803c Undefined check on homepage, update updateCourses.js 2016-08-18 18:36:31 -07:00
Scott Erickson
d4af931e05 Add course (name, description) translations 2016-08-18 10:10:18 -07:00
Matt Lott
f44821bfe1 🐛Fix admin student licenses range coloring 2016-08-17 21:08:23 -07:00
Matt Lott
b647252956 Update /courses UI 2016-08-17 14:15:52 -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
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
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
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
a7e290fffe Replace course guide PDFs with solutions pages 2016-08-11 15:29:56 -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
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
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
9b992a8679 Merge pull request #3823 from Imperadeiro98/master 
Fix #2844
 2016-08-10 09:46:20 -07:00
Matt Lott
6a8776c31b 🐛Add parent blurb to signup birthdate check 2016-08-09 06:33:15 -07: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
Scott Erickson
51b292cc3d Add static messages to game dev levels for playtesting 2016-08-08 11:49:38 -07: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
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
Matt Lott
8b8086a95d 🐛Fix admin classrooms levels page campaign lookup 2016-08-05 12:09:36 -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
Matt Sanders
d5e3be62a4 fixed the background issue on the achievements view 2016-08-05 16:52:02 +12:00
Nick Winter
246469bdde A couple fixes for demo flow 2016-08-04 18:37:13 -07:00
Matt Lott
ba6d51659c Show in-game programming language 
Closes #3814
 2016-08-03 11:08:20 -07:00
phoenixeliot
5f560f3e7d Don't allow conversion to student without a ClassCode 
Fix i18n and tests
 2016-08-01 16:44:57 -07:00
phoenixeliot
94e3c5a2b5 Add first/last names to Account Settings 2016-08-01 14:12:35 -07:00
phoenixeliot
83557910b2 Fix CSV export and projects tab 2016-07-29 14:37:45 -07:00
Nick Winter
e7c1d3d5d3 Remove stale educator wiki link 2016-07-29 14:36:31 -07:00
phoenixeliot
4af822d13a Revert "Add game UI programming language label" 
This reverts commit b7f916116d.

Some heights in gameplay were made worse by this; needs some more work.
 2016-07-29 11:23:42 -07:00
phoenixeliot
4abc26a8d4 Fix progress resetting 2016-07-28 15:47:17 -07:00
Nick Winter
d77625bc77 Game dev levels (#3810) 
* Tweak API doc behavior and styling

* Instead of moving to the left during active dialogues, just move to the top
* Allow pointer events
* Adjust close button
* Re-enable pinning API docs for game-dev and web-dev levels

* Make sidebar in PlayGameDevLevelView stretch, better layout columns

* Set up content of PlayGameDevLevelView sidebar to scroll

* Add rest of PlayGameDevLevelView sidebar content, rework what loading looks like

* Finish PlayGameDevLevelView

* Add share area below
* Cover the brown background, paint it gray

* Tweak PlayGameDevLevelView

* Have progress bar show everything
* Fix Surface resize handling

* Fix PlayGameDevLevelView resizing incorrectly when playing

* Add GameDevVictoryModal to PlayGameDevLevelView

* Don't show missing-doctype annotation in Ace

* Hook up GameDevVictoryModal copy button

* Fix onChangeAnnotation runtime error

* Fix onLevelLoaded runtime error

* Have CourseVictoryModal link to /courses when course is done

* Trim, update CourseDetailsView

* Remove last vestiges of teacherMode
* Remove giant navigation buttons at top
* Quick switch to flat style

* Add analytics for game-dev

* Update Analytics events for gamedev

* Prefix event names with context
* Send to Mixpanel
* Include more properties

* Mostly set up indefinite play and autocast for game-dev levels

* Set up cast buttons and shortcut for game-dev

* Add rudimentary instructions when students play game-dev levels

* Couple tweaks

* fix a bit of code that expects frames to always stick around
* have PlayGameDevLevelView render a couple frames on load

* API Docs use 'game' instead of 'hero'

* Move tags to head without combining

* Add HTML comment-start string

Fixes missing entry point arrows

* Fix some whitespace
 2016-07-28 13:39:58 -07:00
Matt Lott
b7f916116d Add game UI programming language label 2016-07-28 12:00:52 -07:00
Matt Lott
2f7fa4e6e7 Always show level and course name in-game 2016-07-28 06:15:17 -07:00
Rob
6c9f351f01 Group concept map by campaign. 2016-07-27 14:17:37 -07:00
Rob
75e3c54d54 Add concept map view to artisans. 2016-07-27 13:44:55 -07:00
Robin Yang
2cfe7d0b43 Add Elliot Blurb on About Page 2016-07-26 15:32:37 -07:00
phoenixeliot
642847c9c5 Improve progress dot layout for extra courses 2016-07-26 13:11:51 -07:00
phoenixeliot
bd8a284ce6 Improve layout of help blocks in signup form 2016-07-26 11:54:02 -07:00
Scott Erickson
34310642c7 Add destudent and deteacher buttons to AdministerUserModal 2016-07-25 16:09:24 -07:00
Nick Winter
9ae5109e40 Show projects in TeacherClassView, proper font in first web-dev project level for now for demo 2016-07-24 14:42:07 -07:00
Matt Lott
9ad7376edf Add shareable to admin classroom levels page 2016-07-24 08:09:12 -07:00
Matt Lott
9962ff83d4 Level editor play classroom options 2016-07-23 21:03:19 -07:00
Scott Erickson
b1c69b686c Add admin button to update course content for classrooms 2016-07-21 15:16:17 -07:00
Scott Erickson
57f8aedaa5 Hide student tab on TeacherClassView until it's ready 2016-07-21 13:54:37 -07:00
phoenixeliot
b1277dc95f Merge branch 'game-dev-levels' 2016-07-21 10:14:22 -07:00
Nick Winter
436896de4a Update /about jobs 2016-07-21 09:06:57 -07:00
phoenixeliot
6fdda491bd Fix for when database courses/campaigns don't match 2016-07-19 14:13:24 -07:00
phoenixeliot
bb6262483f Allow username-only signup for classroom users 
Address some code review feedback

Correct error code in test

Don't try to send emails to empty addresses

Add tests for subscriptions

Add tests for Next Steps email

Fix specs

Add reason for disabled test
 2016-07-18 10:41:17 -07:00
Matt Lott
607c129c7f School active licenses admin page 2016-07-18 09:41:42 -07:00
Nick Winter
f94cc2ec1f Fix CS1, CS2, GD1, WD2, CS3, etc. labeling in TeacherClassesView, too 2016-07-17 01:12:58 -07:00
Nick Winter
6e65171a83 i18n, comments, misc cleanup 2016-07-17 00:53:17 -07:00
Nick Winter
b04e968da5 Add support for CSS docs 2016-07-16 23:17:05 -07:00
Nick Winter
0cd3278b8f Add simple ImageGalleryView for some sample images in web-dev levels 2016-07-16 13:11:43 -07:00
Nick Winter
dc6a1de9fa Ordering/labeling courses: CS1, CS2, GD1, WD1, CS3, etc 2016-07-16 00:33:10 -07:00
Nick Winter
b64bcd9f02 Use shareable false/true/'project' for different levels of shareability 2016-07-15 23:26:43 -07:00
Nick Winter
6ae89e31f1 Add direct link to play game/web-dev creations while coding them 2016-07-15 22:14:25 -07:00
Nick Winter
5d26b03918 Add buttons to view game/web-dev levels to courses views 2016-07-15 21:57:04 -07:00
Nick Winter
5f95a4d158 Play game-dev levels without API restrictions. Show game button in CourseDetailsView only when appropriate. 2016-07-15 20:47:09 -07:00
Nick Winter
224ad54bdd View web dev levels. Add proper victory modal game/webpage share links. Fix playing game dev levels. Add generic change transition to all web-dev pages. 2016-07-15 20:03:12 -07:00
Scott Erickson
0570644943 Set up a bunch of game dev, web dev playing logic 2016-07-15 16:57:39 -07:00
Scott Erickson
ab704a1cab Merge remote-tracking branch 'origin/web-dev-levels' into game-dev-levels 
# Conflicts:
#	app/views/play/level/PlayLevelView.coffee
 2016-07-15 16:01:57 -07:00
Scott Erickson
10ca59d10f Have CourseVictoryModal used for course-ladder levels 2016-07-15 15:54:22 -07:00
Nick Winter
1e89775486 Basic campaign mode victory modal hookup for web-dev levels 2016-07-15 09:53:16 -07:00
Nick Winter
e3670165e7 Remove code for multiple spells; rename SpellListTabEntryView to SpellTopBarView; remove hero avatar from SpellTopBarView 2016-07-14 22:43:25 -07:00
Nick Winter
33ba3f6033 Enable docs for web-dev levels 2016-07-14 19:14:18 -07:00
Nick Winter
ed320a8d9e WebSurfaceView now parsing player code through virtual DOM into iframe 2016-07-14 18:07:36 -07:00
Scott Erickson
c0bc10ffb6 Add projects tab stub to TeacherClassView 2016-07-14 15:53:54 -07:00
Scott Erickson
61caf3dcd3 Merge branch 'master' into game-dev-levels 2016-07-14 15:50:04 -07:00
Nick Winter
16b10612b6 Stub WebSurface showing for web-dev levels 2016-07-14 12:34:22 -07:00
Nick Winter
c5c831c211 Remove real-time multiplayer prototype code 2016-07-14 10:26:09 -07:00