codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-14 09:41:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
10927 commits 27 branches 0 tags 134 MiB
Commit graph

3216 commits

Author SHA1 Message Date
Matt Lott
d6694adb57 🐛Fix disappearing classroom student progress 
JIT course instances were not getting the sessionsByUser mapping in
some cases.
 2015-12-07 14:15:56 -08:00
Imperadeiro98
b0a1334eec Removed play-level-modal 
I think it is no longer used
 2015-12-07 21:36:50 +00:00
Nick Winter
e375b8cdc8 Merge pull request #3185 from Imperadeiro98/the-branch 
Refactor to use view in template
 2015-12-07 09:28:26 -08:00
Matt Lott
0d752d8242 🐛Fix class student remove 2015-12-06 20:01:52 -08:00
Matt Lott
01f6e098a1 🐛Fix /courses/purchase purchase amount 2015-12-06 16:21:08 -08:00
Matt Lott
66f434adba Update class progress colors 2015-12-06 15:00:00 -08:00
Matt Lott
cb4d8fee8c Update /courses/purchase visuals 2015-12-06 14:26:35 -08:00
Nick Winter
0a1be8e80e Don't load ambient sound in CampaignView if muted 2015-12-06 12:33:28 -08:00
Nick Winter
1187390fd0 Improve simulation game logic, and re-enable automatic simulations under certain conditions, better targeted toward the matches the player cares about 2015-12-06 09:20:37 -08:00
Nick Winter
f38eea3590 Merged. Turn off chained rankings for now since they are slow and don't work anyway 2015-12-06 04:36:41 -08:00
Imperadeiro98
551dd5d98f Merge pull request #3237 from micman73/patch-5 
Update DiplomatView.coffee
 2015-12-05 20:01:12 +00:00
Nick Winter
77731dad84 Improve server caching and ladder view refresh performance 2015-12-05 08:18:36 -08:00
Matt Lott
77a8347b5e Prevent double _cc classroom join 2015-12-04 16:47:52 -08:00
Matt Lott
b9af07c785 Classroom view logged out Ux 2015-12-04 16:37:13 -08:00
micman73
955adc9a83 Update DiplomatView.coffee 
two more diplomats in greek translation
 2015-12-05 02:10:18 +02:00
Scott Erickson
31b65ef247 IE9 hacks 
* GET params in a url sent through router.navigate are lost on IE9, use document.location.href = url instead
* Temporarily put raster images in the DOM to give them dimensions so they are rendered in the spritesheet correctly
* Add {cache: false} to fetches for /hoc course instances and sessions
 2015-12-04 15:50:07 -08:00
Scott Erickson
ed478e7c5e Update enrollment terminology in ActivateLicensesModal, change enroll button color on disabled 2015-12-04 14:53:43 -08:00
Scott Erickson
afb26d535b Update ClassroomView with new enrollment terminology 2015-12-04 14:53:43 -08:00
Matt Lott
eed5ee552c 🐛Fix course details arena button jquery 
Clicking on text within button was a problem.
 2015-12-04 14:28:05 -08:00
Matt Lott
ee9e16a484 /courses/teachers analytics 2015-12-04 14:19:59 -08:00
Scott Erickson
6ac659b571 Add explanatory copy to TeacherCoursesView 2015-12-04 14:17:24 -08:00
Matt Lott
3fb85463fa Classroom details analytics 2015-12-04 14:11:47 -08:00
Matt Lott
44cd64e00e /courses analytics 2015-12-04 12:08:14 -08:00
Nick Winter
6d6f6138b1 Allow up to 63-character-long TLDs in email addresses 2015-12-04 12:06:42 -08:00
Nick Winter
c36bed8103 Fix classroom handling of sessions with no state yet 2015-12-04 11:59:51 -08:00
Matt Lott
4778cf5535 /hoc analytics 2015-12-04 11:31:49 -08:00
Nick Winter
16b1928fdb Default Play to /hoc route during Hour of Code week 2015-12-04 11:04:45 -08:00
Scott Erickson
97c28e1c8a Improve slow level loading on CampaignView 
* Fix LevelSetupManager to call onLevelSync asynchronously if level is not loaded on init
* Show a progress bar in level-info-container while level is loading asynchronously
 2015-12-04 10:26:09 -08:00
Scott Erickson
8d70b5d53f Remove course mocks 2015-12-04 09:29:14 -08:00
Matt Lott
924bef3baa Remove autoplay from course details view 2015-12-03 16:25:33 -08:00
Matt Lott
c610ce6ffd Remove progress tab from course details view 2015-12-03 16:25:33 -08:00
Scott Erickson
52cb638a6c Have Student login/signup modals automatically focus first inputs 2015-12-03 16:16:28 -08:00
Scott Erickson
d874569b27 Add stats to ClassroomView 2015-12-03 14:51:38 -08:00
Scott Erickson
b2ed489197 Make sure LadderView displays a valid link back to levels for course arenas 2015-12-03 13:46:50 -08:00
Scott Erickson
3ac8f16d28 Fix ClassroomView sparse progress handling 2015-12-03 13:32:22 -08:00
Scott Erickson
afbfc69fd5 Hide teacher controls in ClassroomView when a student is viewing 2015-12-03 13:16:57 -08:00
Scott Erickson
1b30b0e72a Project sessions loaded in ClassroomView 2015-12-03 12:36:37 -08:00
Scott Erickson
3fefdfa0a7 Add student total playtime to ClassroomView 2015-12-03 12:29:30 -08:00
Nick Winter
7cbe679f6b Remove red color for now for indentation visualizer (#3232) 2015-12-03 12:14:42 -08:00
Scott Erickson
1df87fa685 Add detailed progress and links to ClassroomView 2015-12-03 12:10:08 -08:00
Nick Winter
b0e9670453 Fixed course indexing for first levels in courses 2015-12-03 12:04:49 -08:00
Matt Lott
3b21567fac Add analytics to /teachers 2015-12-02 17:10:19 -08:00
Scott Erickson
3057df0230 Have clicking the link in InviteToClassroomModal copy it 2015-12-02 16:33:24 -08:00
Scott Erickson
629aff2807 Ignore negative numbers in purchase courses view 2015-12-02 16:10:57 -08:00
Scott Erickson
90ac6baa67 Fix course instance generation for classrooms 2015-12-02 16:07:54 -08:00
Matt Lott
e2b2a6d396 Update /teachers 2015-12-02 15:19:52 -08:00
Nick Winter
80253305fb Add ?simulate=true option for testing background simulations 2015-12-02 14:57:06 -08:00
Scott Erickson
ac36c0146f Quick fix for StudentLoginModal error when username or password is not included 2015-12-02 14:19:46 -08:00
Scott Erickson
3c1a55fc2f Merge branch 'courses-vhoc' 2015-12-02 13:16:24 -08:00
Nick Winter
e5a68f1ae9 Disable background simulations while playing levels for now 2015-12-02 12:07:43 -08:00
Scott Erickson
c0b979a572 Migrate join classroom url to /courses from /courses/students 2015-12-02 12:05:54 -08:00
Scott Erickson
7f2ddba089 Add remove student modal to ClassroomView 2015-12-02 11:56:38 -08:00
Nick Winter
a0e5126ab7 Prompt for school name on course completion 2015-12-02 10:59:55 -08:00
Nick Winter
0d65d73024 Finish merging master into courses-vhoc 2015-12-02 10:10:50 -08:00
Nick Winter
c77e1c0fa2 Add course complete visual state for student CourseDetailsView 
Also including a few misc tweaks to CourseDetailsView and the end-of-course HeroVictoryModal state.
 2015-12-02 09:52:52 -08:00
Nick Winter
83f41e7808 Add buildable ogre types to DuelStatsView army power table 2015-12-02 06:46:39 -08:00
Nick Winter
3433760cfe Only show hero campaign progress in ClanDetailsView 2015-12-02 06:46:19 -08:00
Nick Winter
0f8a5673da Don't save empty strings for schoolName 2015-12-01 18:04:14 -08:00
Nick Winter
88ee363576 Add schoolName field to AuthModal 2015-12-01 17:44:03 -08:00
Nick Winter
cccf61e2e8 Remove a log 2015-12-01 17:38:52 -08:00
Nick Winter
3728b2dc4e Added completion notice to course details 2015-12-01 17:32:32 -08:00
Matt Lott
56dadbf35a Hide course details progress from anonymous 2015-12-01 17:32:32 -08:00
Nick Winter
26e321d9e7 Add schoolName field to StudentSignupModal 2015-12-01 17:32:24 -08:00
Nick Winter
8e1143b519 Add schoolName field to AuthModal 2015-12-01 17:32:02 -08:00
Matt Lott
ea1996809c /courses/teachers add students modal 2015-12-01 13:41:45 -08:00
Scott Erickson
af136764de Add enabling users to ClassroomView 2015-12-01 15:27:12 -06:00
Scott Erickson
cbdef392c5 Add invite modal to ClassroomView 2015-12-01 15:17:21 -06:00
Nick Winter
55529cc2bb Don't show higher AI difficulty achievements in victory modal 2015-12-01 12:32:51 -08:00
Nick Winter
6b1c859e91 Preserve SuperModel when navigating between course levels 2015-12-01 12:23:01 -08:00
Nick Winter
e7809c6622 Saven even more slowly for anonymous players during high load 2015-12-01 11:51:55 -08:00
Nick Winter
ae6eca583a Present 'Play Classroom Version' before playing a campaign level when appropriate 2015-12-01 11:24:16 -08:00
Rob
d0f3aeec91 Draw visual indent marker by hand so it's more stylish. 2015-12-01 12:22:48 -05:00
Rob
db060e9816 Fix visual indents when document row doesn't match screen row. 2015-12-01 12:02:56 -05:00
Imperadeiro98
4050e0b498 Revert commit 480a310 2015-12-01 14:52:17 +00:00
Nick Winter
851e3a092e Play button goes to /courses if that's all the player has played 2015-11-30 16:43:33 -08:00
Matt Lott
171e4f888e Update /courses/teachers 
Adding edit class settings modal
Adding create new class modal
Repurposing ClassroomSettingsModal for create new class too.
 2015-11-30 16:20:24 -08:00
Nick Winter
a8eaa79db3 Always shows level intro doc scrollbars 2015-11-30 15:33:50 -08:00
Nick Winter
22af180a86 Move gold display to DuelStatsView for Wakka Maul and remove army power display for non-army ladders 2015-11-30 14:58:36 -08:00
Rob
fa21f9ef68 Add an extra indent line if the line following a range is only whitespace. 2015-11-30 17:23:29 -05:00
Nick Winter
cc3a62febd Fix loss of editor focus when clicking error messages and property docs popovers 2015-11-30 14:18:42 -08:00
Nick Winter
252b9a66e9 Don't encourage skip (esc) when in full-screen mode where esc exits full-screen mode 2015-11-30 14:10:34 -08:00
Nick Winter
97043c4a25 Autoplay when observing others' replays 2015-11-30 14:01:39 -08:00
Scott Erickson
5e733d1517 Add ActivateLicensesModal to ClassroomView 2015-11-30 16:59:22 -05:00
Nick Winter
8fd47535d1 Put video into its own guide tab, fix intro tabs 2015-11-30 13:54:13 -08:00
Nick Winter
69379fb54f Show floating hero player names in course-ladder levels 2015-11-30 13:05:34 -08:00
Nick Winter
2588bfb08b Reduce some writes during HoC to help scaling 2015-11-30 13:05:34 -08:00
Imperadeiro98
60f40bb859 Add closing sound to InventoryModal 2015-11-30 20:53:52 +00:00
Nick Winter
26be2842ed Don't highlight Done button as much until winning replay has finished 2015-11-30 11:34:47 -08:00
Scott Erickson
0c45e3f96c Add ClassroomView, incomplete 2015-11-30 14:14:27 -05:00
Rob
716f759e11 Be more helpful when opening a new indent. 2015-11-30 14:13:07 -05:00
Nick Winter
4dde508570 Merge pull request #3190 from Imperadeiro98/fix-2916 
Fix #2916
 2015-11-30 10:59:22 -08:00
Rob
79fe249291 Merge branch 'visual-indent' 2015-11-30 13:55:25 -05:00
Rob
1b43c3e54f Clean up visual idents, limit to players under level 20 or with indentGuides turned on. 2015-11-30 13:54:50 -05:00
Nick Winter
ecfd982847 Note PayPal payment method. End limited-time year sale. 2015-11-30 10:50:34 -08:00
Matt Lott
a851b7129a 🐛Fix teacher course management null check 2015-11-30 10:41:57 -08:00
Nick Winter
542cd98329 Fix #3221 2015-11-30 07:23:33 -08:00
Scott Erickson
d255802e38 Set up /courses for individuals without any course instances 2015-11-29 18:41:57 -05:00
Scott Erickson
11e9a40645 Finish hooking up ChangeCourseLanguageModal into /courses 2015-11-29 18:25:57 -05:00
Scott Erickson
8662fb057f Fix /courses when not joining 2015-11-29 18:20:38 -05:00
Scott Erickson
87c7bafd57 Add join-class functionality to /courses 2015-11-29 18:13:31 -05:00
Scott Erickson
405785bafe Add completion stats to /courses 2015-11-29 17:18:24 -05:00
Scott Erickson
07ad8382cc Project sessions loaded in /courses 2015-11-29 16:17:55 -05:00
Nick Winter
ee6be55a9d Don't load sounds from level while muted 2015-11-29 12:32:04 -08:00
Nick Winter
95c703a7df Simulate games in background while playing levels if we think there's extra compute power 2015-11-29 12:30:19 -08:00
Scott Erickson
47acfc93d0 Fix course buttons and level links in /courses 2015-11-29 15:26:17 -05:00
Scott Erickson
ea0c274a3c Fix /courses initial implementation 2015-11-29 15:26:17 -05:00
Matt Lott
33599c8632 Update /teachers based on latest visual design 2015-11-29 07:02:45 -08:00
Nick Winter
46e738a737 Collapse sets of achievements in achievements list 2015-11-28 08:39:05 -08:00
Rob
e6afb51085 First pass at showing indention guides. 2015-11-27 20:46:55 -05:00
Nick Winter
a6f980dab1 Support for pre-configuring hero on Assembly Speed 2015-11-27 12:12:58 -08:00
Scott Erickson
d4540af780 Merge branch 'master' into courses-vhoc 2015-11-27 10:43:15 -05:00
Nick Winter
d465a3080d Merge branch 'master' of https://github.com/codecombat/codecombat 2015-11-25 16:51:27 -08:00
Nick Winter
88cca795c6 Don't try to autorank anonymous users playing autoranked ladder levels 2015-11-25 16:51:12 -08:00
Nick Winter
8d444e7ce8 Fix returning to course-ladder in HeroVictoryModal when arrived at via next-level button 2015-11-25 16:50:42 -08:00
Matt Lott
c385aaa414 Merge branch 'master' into courses-vhoc 2015-11-25 16:11:36 -08:00
Matt Lott
7b01fd7b65 Add course name to victory modal 2015-11-25 14:23:35 -08:00
Matt Lott
24345cf296 Course victory modal current and next level names 2015-11-24 16:46:27 -08:00
Nick Winter
b44714a60b Fix achievement loads never happening if you didn't earn any of them 2015-11-24 13:49:38 -08:00
Nick Winter
9f0a843593 Enable auto-submission to ladder for Wakka Maul 2015-11-24 13:35:15 -08:00
Imperadeiro98
01c7efb78a Merge pull request #3205 from criptonauta/patch-3 
Update DiplomatView.coffee
 2015-11-24 21:20:06 +00:00
Nick Winter
67f14c7928 Try putting AI players in league ladders 2015-11-24 13:18:38 -08:00
criptonauta
fddd11f9b4 Update DiplomatView.coffee 2015-11-24 18:16:10 -03:00
Matt Lott
f261c1466a Update /teachers 
Stop forwarding to HoC
Update copy with courses info.
 2015-11-24 10:59:14 -08:00
Matt Lott
d7a66722b9 Update teacher surveys 
Removing trial subscriptions
Updating trial page copy
Adding special HoC trial
Introducing a new course prepaid property endDate, which won’t be
returned or redeemed after the date.
 2015-11-24 10:32:19 -08:00
Nick Winter
ec7f17a149 Show level indexes in courses 2015-11-24 08:56:28 -08:00
Nick Winter
d675e14f59 Fix issue returning to ladder when playing course-ladder levels outside of a course arena 2015-11-24 08:36:57 -08:00
Nick Winter
65890130bb Change how goals are expanded/collapsed at beginnings of levels 2015-11-24 08:28:05 -08:00
Scott Erickson
2adb3362ed Add ChangeCourseLanguageModal to CoursesView 2015-11-23 11:52:15 -06:00
Scott Erickson
03a38f6129 Remove some logs 2015-11-23 08:53:13 -08:00
Scott Erickson
ea4a98af86 Add rest of CoursesView, untested, unhooked to server 
On a plane, so skipping my usual iterative testing.
Bugs are undoubtedly everywhere.
 2015-11-23 08:46:08 -08:00
Matt Lott
1f962e7667 Fix analytics /db GET URL 2015-11-22 09:26:35 -08:00
Nick Winter
21810be8eb End an A/B test 2015-11-22 07:53:49 -08:00
Nick Winter
e0011ee5d0 Classroom invite codes are now real words like BigFrogFarm 2015-11-22 07:47:28 -08:00
Scott Erickson
a98d0b1b2a Partial work on /courses view when signed in 2015-11-22 00:08:46 -08:00
Scott Erickson
5aff591a8b Set up courses view for anonymous users 2015-11-21 11:38:34 -08:00
Scott Erickson
9292396dad Add logout link to HourOfCodeView when signed in 2015-11-20 18:22:52 -08:00
Scott Erickson
27b21d0c4e Add classroom code handling to StudentSignUpModal 2015-11-20 18:02:02 -08:00
Scott Erickson
aee1f6587a Add StudentSignUpModal to HourOfCodeView 2015-11-20 16:28:28 -08:00
Matt Lott
9d329d4a1d Migrate external trial requests to database 
Added created field to ~2800 older trial.requests
Inserted ~700 external requests from Google forms
 2015-11-20 15:53:00 -08:00
Scott Erickson
65dd571041 Fix StudentLoginModal when email or password is not included 2015-11-20 15:17:04 -08:00
Scott Erickson
f7f405b774 Remove colons from template, unused formValues from view 2015-11-20 14:52:13 -08:00
Scott Erickson
f8a5baa4f6 Finish StudentLoginModal implementation 2015-11-20 13:59:43 -08:00
Scott Erickson
9dbd4d296a Merge branch 'master' into courses-vhoc 2015-11-20 13:28:43 -08:00
Scott Erickson
bcb869594d Add start of StudentLoginModal 2015-11-20 07:52:35 -08:00
Nick Winter
7ede7928ca Fix typo in course ladder links 2015-11-20 07:17:16 -08:00
Nick Winter
be00cae1df Fix returning to course ladder from arena modals 2015-11-19 16:36:29 -08:00
Nick Winter
9049d2498e Fix #3179: pending patches collections using _ instead of . 2015-11-19 15:41:20 -08:00
Nick Winter
7fdd6d5180 Fix #3174: save button triggering on delete/reset account form fields 2015-11-19 15:37:37 -08:00
Nick Winter
9ccd03f8d6 Make /teachers -> /courses/teachers?hoc=true more reliable 2015-11-19 15:32:52 -08:00
Scott Erickson
1a4a143340 Initial build of /hoc, no login/create account modals yet 2015-11-19 15:26:45 -08:00