codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-02 11:58:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
12350 commits 27 branches 0 tags 134 MiB
Commit graph

2373 commits

Author SHA1 Message Date
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
Scott Erickson
48502c40e6 Merge pull request #3788 from matt-sanders/master 
fixes #3393 by allowing the content to scroll
 2016-07-14 10:03:12 -07:00
Nick Winter
87ed53b24b Merge branch 'master' into web-dev-levels 2016-07-14 08:26:27 -07:00
Scott Erickson
fb9998b15e Add temp buttons to CourseDetailsView for testing PlayGameDevLevelView 2016-07-13 16:05:41 -07:00
Scott Erickson
d7a2219b16 Refactor PlayGameDevLevelView to use promises 2016-07-13 13:28:54 -07:00
Scott Erickson
1b7ac76b9f Add loading and playing to PlayGameDevLevelView 2016-07-13 11:43:25 -07:00
Scott Erickson
3a0695f59c Add some basic info to PlayGameDevLevelView 2016-07-12 15:12:11 -07:00
Scott Erickson
25e348c5ad Initial, basically working PlayGameDevLevelView 2016-07-12 14:07:10 -07:00
Scott Erickson
0b1e1ddcb4 Merge branch 'game-dev-levels' 2016-07-12 11:00:29 -07:00
phoenixeliot
0cf04a9658 Fix birthday form layout in firefox 2016-07-11 11:51:12 -07:00
Matt Sanders
ed498ace7e fixes #3393 by allowing the content to scroll 2016-07-11 17:01:33 +12:00
Matt Lott
9b68e91409 🐛Fix analytics dashboard coursePrepaid use 2016-07-10 17:55:07 -07:00
Nick Winter
8c48e4fc14 Remove transpiledCode and screenshot from LevelSession 2016-07-08 17:04:24 -07:00
phoenixeliot
6fb4cbd9ac Remember checkbox state in TeacherClassView 2016-07-08 16:24:33 -07:00
phoenixeliot
1b8d3ed023 Improve spacing for CreateAccountModal on chromebooks 
Improve spacing for type-select screen on chromebooks

Improve spacing for basic-info screen on chromebooks

Improve spacing for confirmation screen on chromebooks

tweak spacing
 2016-07-08 16:24:33 -07:00
Scott Erickson
1da82fa851 Fix #1199 2016-07-07 16:34:24 -07:00
Scott Erickson
af9f7201d0 Finish new CreateAccountModal 2016-07-07 15:56:41 -07:00
phoenixeliot
e9b7543242 Start new CreateAccountModal 2016-07-07 15:56:41 -07:00
phoenixeliot
21233e631d Fix arena back-to-levels link 2016-07-07 15:14:25 -07:00
Matt Lott
a884fbf38b Admin class progress CSV export 2016-07-07 11:07:38 -07:00
Matt Lott
15a605505e Link classroom levels from main admin page 2016-07-01 07:56:56 -07:00
Matt Lott
ba54754373 Admin classroom levels page 2016-06-30 08:29:27 -07:00
Rob
ac47928131 - Reduce size of answer code in verifier 
- Assume we want to run a single level on only one core for accurate speed testing.
 2016-06-29 16:18:36 -07:00
Matt Lott
63e38c82b2 Update school counts page with geoip and 10+ buckets 
Placing teachers and students in unknown districts and schools if we
have geoip countries and states/regions.
Placing teachers/students in unknown schools if there are 10+ students.
 2016-06-29 15:01:04 -07:00
Nick Winter
ede12ed50f Add effective simulation frames per second to verifier 2016-06-29 12:40:30 -07:00
Matt Lott
d6951559fd Update school counts page 
Exclude HoC users via course instances
Include teacher/students via trial requests without NCES data
 2016-06-28 16:41:36 -07:00
Nick Winter
3250156f95 Fix typo in our zip code 2016-06-28 13:58:19 -07:00
Matt Lott
d72e4eb750 Practice levels Ux and next level algorithm 
Update classroom and gameplay Ux to surface practice levels as 3a, 3b,
etc.
Update next level logic to leverage practice levels based on per level
completion playtime thresholds.
Patrol buster and patrol buster A are live for testing.
Fix a few classroom Ux progress hover bubble info bugs.

Closes #3767
 2016-06-27 14:05:42 -07:00
Scott Erickson
fa1143e599 Merge pull request #3762 from UltCombo/gh-3729 
Create account modal: don't open Facebook popup when pressing Enter in an input field, fixes #3729
 2016-06-27 09:10:47 -07:00
Matt Lott
425115ad37 Remove level type 'hero-practice', use level.practice 2016-06-25 08:38:59 -07:00
Fabrício Matté
26b0ad7fd1 Create account modal: don't open Facebook popup when pressing Enter in an input field, fixes #3729 
Ref: #3729

`<button>`s are `type="submit"` by default.
 2016-06-25 03:23:02 -03:00
Matt Lott
1d70837309 Exclude practice levels from teacher course guides 2016-06-21 21:10:59 -07:00
Rob
bdfa6d435a Add extra options to verifier. 2016-06-21 11:48:42 -07:00
Nick Winter
56cdfa9fc7 Update our /privacy address 2016-06-21 09:41:21 -07:00
Matt Lott
df90935aba Admin school counts page 2016-06-21 09:33:06 -07:00
Matt Lott
4622337d82 Update licenses needed form 
Ensure the needed licenses are in the subject resulting email.
 2016-06-17 15:40:07 -07:00
Scott Erickson
514fce349a Include ladder levels in level stats in teacher views, clean client test logs 2016-06-17 15:15:13 -07:00
Scott Erickson
57def1fbeb Merge pull request #3727 from duybkict/refactor-MyMatchesTabView 
#3138 #3488 refactor MyMatchesTabView
 2016-06-16 10:41:17 -07:00
Scott Erickson
a4b5e92b06 Merge pull request #3726 from duybkict/refactor-SimulateTabView 
#3138 #3488 refactor SimulateTabView
 2016-06-16 10:34:53 -07:00
Scott Erickson
86fc4a3846 Hints v1 
Add per-level tips and tricks, available during gameplay to help unstick players.

Closes #3736
 2016-06-15 16:12:41 -07:00
phoenixeliot
9239d2a81b Fix text overflowing on teacher dashboard 2016-06-15 13:09:43 -07:00
Matt Lott
e7d076be65 Update logo 2016-06-11 21:33:15 -07:00
Matt Lott
9dbcf27e11 Add classroom Mixpanel logging 
Closes #3720
 2016-06-09 10:46:26 -07:00
duybkict
0c0f075424 #3138 #3488 refactor MyMatchesTabView 2016-06-09 10:31:53 +07:00
duybkict
a4e8cafdb3 #3138 #3488 refactor SimulateTabView 2016-06-09 10:00:47 +07:00
Scott Erickson
0d5bf6b4de Merge branch 'username-login' 2016-06-08 15:48:46 -07:00
Matt Lott
546598396d Add Lisa to /about page 2016-06-08 15:46:21 -07:00
Scott Erickson
69f3ee3a5b Allow username login, tear out a bunch of related stuff in change 
* Switch from auth.loginUser to User.loginPasswordUser with Promise
* Remove a cascade of unused views that were using auth.loginUser: StudentLogInModal, StudentSignupModal, HourOfCodeView
* Also remove auth.createUser
 2016-06-08 13:55:19 -07:00
Scott Erickson
86699a8510 Merge pull request #3719 from duybkict/refactor-LadderTabView 
#3138 #3488 refactor LadderTabView
 2016-06-08 10:01:37 -07:00
Scott Erickson
2f9f062165 Merge pull request #3718 from duybkict/refactor-LadderPlayModal 
#3138 #3488 refactor LadderPlayModal
 2016-06-08 09:53:59 -07:00