Commit graph

3183 commits

Author SHA1 Message Date
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
Nick Winter
2fecaf9618 Show AI flare in ladders. Show more players for league ladders. 2015-11-19 15:18:53 -08:00
Nick Winter
e80544e215 Don't show Capture Their Flag clan ladder yet 2015-11-19 14:47:41 -08:00
Nick Winter
93fccaa23f Show humans vs. ogres for Wakka Maul ladder 2015-11-19 14:47:25 -08:00
Imperadeiro98
480a310313 Add sound to Facebook login 2015-11-19 21:36:57 +00:00
Nick Winter
ef7618497f Fix #3184: get more of our campaign overworld properties we need 2015-11-19 13:20:42 -08:00
Nick Winter
3926204f47 Don't do course arena league for solo course ladders 2015-11-19 13:20:21 -08:00
Nick Winter
c8ceca4d3d Add user.courseInstances, use it for course ladders 2015-11-19 10:41:31 -08:00
Imperadeiro98
094743c4f5 Fix #2916 2015-11-19 17:05:00 +00:00
Scott Erickson
7a6c42b89f Set up course-ladder level handling
* LadderView displays course info, different style for course-ladder levels
* LadderView hides simulate tab for course-ladder levels
* HeroVictoryModal links to LadderView for course-ladder levels
* CourseDetails page links to LadderView for course-ladder levels
* Enable course instances for league simulation
2015-11-18 14:02:45 -08:00
Imperadeiro98
db6166d22c Some changes 2015-11-18 19:33:26 +00:00
Imperadeiro98
a19225013b Refactor to use view in template 2015-11-18 19:16:44 +00:00
Scott Erickson
6a54c7cf54 Add classroom name, description, and language editing, and classroom language infrastructure 2015-11-17 16:10:23 -08:00
Nick Winter
a0038602a1 Fix some course level submit button behavior, also help mirror session scoring 2015-11-17 15:26:10 -08:00
Nick Winter
a5fc31dbb3 Allow multiplayer levels to earn achievements 2015-11-17 15:23:35 -08:00
Nick Winter
01c9948b5b Favor complete over incomplete sessions in CampaignView flag status 2015-11-17 15:23:34 -08:00
Rob
7a86f754df Add flavor to overworld. 2015-11-17 11:27:08 -08:00
Rob
991fead0f6 Create specific campaign view for campaign selection screen. 2015-11-17 11:15:56 -08:00
Nick Winter
0abb9a38ad Use nanoscroller to allow intro doc scrolling 2015-11-15 08:23:12 -08:00
Nick Winter
ef72286864 Don't autoplay hero or course levels by default. Fix Course: Known Enemy autocomplete string format. 2015-11-15 07:59:20 -08:00
Nick Winter
5d9d5c0ae6 Remove ProblemAlertView help button 2015-11-14 17:33:05 -08:00
Nick Winter
aee2f7c219 Add loading indicators, hide UI pre-load for /play 2015-11-14 17:30:37 -08:00
Nick Winter
b31e5fc93a Fix user.code.problem routes to use . instead of _ 2015-11-14 16:32:21 -08:00
Rob
c0d9c231bc Normalize some URLs that used both .s and _s to use only .s 2015-11-13 15:16:03 -05:00
Matt Lott
c7a7a9d3ac Redirect /teachers to /courses/teachers?hoc=true
Will update /teachers soon with relevant information, but at the moment
it is too outdated.
2015-11-13 10:30:37 -08:00
Matt Lott
c7118d69e5 Redirect 2014 HoC link to 2015 HoC link
https://app.asana.com/0/54276215890539/65805646890763
2015-11-13 10:17:05 -08:00
Nick Winter
356f65561c Add ladder banner images to ladder home 2015-11-12 16:30:56 -08:00
Nick Winter
9e61928080 Add reset progress feature in account settings 2015-11-12 15:27:28 -08:00
Matt Lott
e6e0617945 Tracking property for admin added course headcount 2015-11-12 12:16:40 -08:00
Nick Winter
910dd8e6b6 Use course access control for shared course hero levels 2015-11-12 11:00:54 -08:00
Nick Winter
cb101c7905 Replace simple loops while while True in course level sample code 2015-11-12 11:00:51 -08:00
Nick Winter
fe05e66458 Give Campaigns types so that course campaigns can share hero levels 2015-11-12 10:25:25 -08:00
Nick Winter
f7f7cd683e Allow using hero levels as course levels. Refactor current course tracking to use GET parameters. 2015-11-12 10:25:25 -08:00
Scott Erickson
8b00c38350 Merge pull request #3168 from Imperadeiro98/use-view
Refactor to use view in template for issue #3138
2015-11-12 09:58:49 -08:00