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

3405 commits

Author SHA1 Message Date
Matt Lott
609884eb51 Update furthest course dashboard tables 
Adding a second table, setting range to be 60 and 365 days.
Updating teacher columns to prioritize student paid status over
furthest student course.
 2016-02-24 06:25:01 -08:00
Matt Lott
dd603a0436 Add school sales table to dashboard 2016-02-24 06:25:01 -08:00
Matt Lott
e471d652e5 Add more year long dashboard graphs 2016-02-24 06:25:01 -08:00
Scott Erickson
e2feeb8330 Prevent didReappear from setting up shortcuts twice for RootViews 2016-02-23 12:00:07 -08:00
Scott Erickson
becad06750 Refactor ArticleEditView and PatchesView to use model endpoint functions 2016-02-22 16:03:21 -08:00
Matt Lott
cac9a7463f Dashboard monthly revenue counts, and tabs 2016-02-20 17:27:45 -08:00
Scott Erickson
3390663486 Fix GuideView to use session.codeLanguage by default 2016-02-19 10:55:42 -08:00
Matt Lott
19d0e67002 Dashboard classroom vs campaign year chart 2016-02-19 09:32:17 -08:00
Imperadeiro98
92dc72cce1 Remove name from loadModel 2016-02-18 16:44:40 +00:00
Matt Lott
1f01b3ffbd Update revenue analytics with payment.prepaidID 2016-02-17 13:01:09 -08:00
Scott Erickson
cf030146e8 Restrict request quote emails 
* If logged in => repopulate and lock email (and name if available)
* If logged out => disallow using an email for an existing account and display a validation message + login link
 2016-02-17 11:51:26 -08:00
Nick Winter
b5bb662ed2 Add picoCTF problem descriptions to levels; streamline picoCTF flows more 2016-02-17 11:33:56 -08:00
Scott Erickson
0905a378a0 Fix recent scrolling changes for Firefox 2016-02-17 11:21:43 -08:00
Scott Erickson
c8551a6382 Make new home page responsive 2016-02-17 11:05:20 -08:00
Matt Lott
cb29d7068b Add prepaids to payments 
Closes #3402
 2016-02-17 10:08:44 -08:00
Nick Winter
37fbd8ca21 Start to play picoCTF levels as course levels without hero selection 2016-02-17 09:53:45 -08:00
Nick Winter
fe351be32e Start to rework CampaignView when we're in picoCTF mode 2016-02-16 20:39:59 -08:00
Scott Erickson
c2f02ebbfb Fix scrollToLink, including removing unneeded offset 2016-02-16 10:47:49 -08:00
Matt Lott
73657d5428 Update analytics dashboard 
Splitting out classroom and campaign active users
Adding more detailed active users graphs
Patching up missing analytics log events for 2/2/16-2/9/16
 2016-02-16 09:23:42 -08:00
Nick Winter
6800ea2ff7 Add picoCTFProblem field to levels 2016-02-10 14:16:54 -08:00
Matt Lott
06436a4bb7 Add levelID property to show subscription modal events 
Allows us to consolidate analytics collection indexes and code someday.
 2016-02-09 16:50:55 -08:00
Josh Callebaut
7db678e63f Merge pull request #3380 from Zerrien/editorChanges 
Style fixes and fixes level submission emails
 2016-02-09 09:42:05 -08:00
Nick Winter
0ef29ddb95 Restrict who counts as a teacher in analytics 2016-02-08 14:44:38 -08:00
Scott Erickson
bb38c58903 Properly fix duplicate course instances 
* Add script to merge existing course instances
* Have client only send one course instance creation
* Have server return existing course instance if one for the given classroom/course exists
* Remove bandaid code from ClassroomView
 2016-02-08 12:48:29 -08:00
Matt Lott
bd9ca8ee5f Add enrollments graph to analytics dashboard 2016-02-06 14:02:44 -08:00
Scott Erickson
abb4e2fa47 Filter out duplicate course instances client-side 2016-02-05 14:03:43 -08:00
Scott Erickson
944b6b743f Add homepage unsupported browser messages to new home page 2016-02-05 11:39:06 -08:00
Matt Lott
b495c581a7 Enable analytics tracking on request quote view 2016-02-05 10:49:46 -08:00
Matt Lott
5d2ad62fb9 Add top school counts to analytics dashboard 2016-02-04 17:31:25 -08:00
Scott Erickson
95e627f346 Merge pull request #3374 from taptapdan/issue-3138-CastButtonView 
Refactor CastButtonView to use view in template
 2016-02-04 14:53:13 -08:00
Daniel Fiore
d0d19f94e9 Refactor ProblemAlertView to use view in template 2016-02-04 14:44:29 -08:00
Scott Erickson
b91299a59f New home page tweaks 2016-02-03 10:59:54 -08:00
Josh Callebaut
0eb32aac24 Creates clickable links for default tasks 2016-02-03 10:26:36 -08:00
Scott Erickson
9e38587719 Do not hide teacher note for small screens, add close link 2016-02-03 10:10:43 -08:00
Daniel Fiore
6ad5d6bc73 Refactor CastButtonView to use view in template 2016-02-02 15:57:55 -08:00
Nick Winter
260fd21f4e Add Segment for teachers, misc analytics cleanup tweaks 2016-02-02 15:13:55 -08:00
Nick Winter
24fc14260e Add /privacy policy page 2016-02-02 15:13:54 -08:00
Scott Erickson
fa54b639c7 Hide modal wrapper when no modal 2016-02-02 15:13:54 -08:00
Scott Erickson
0e7e9aad39 Add new home page with test 2016-02-02 15:12:37 -08:00
Scott Erickson
ab62982bac Tweak RequestQuoteView form to better fit best practices 
* Scroll to errors
* Set email input type to 'email'
 2016-02-01 15:51:29 -08:00
Scott Erickson
5fffb2eefb Remove TeachersFreeTrialView 2016-02-01 10:40:22 -08:00
Josh Callebaut
14ef28b658 Merge pull request #3369 from Zerrien/master 
Editor Changes (Task tab, pre-initialize tasks, Artisan nurturing, level submission)
 2016-01-29 09:42:04 -08:00
Scott Erickson
e62e497543 Replace TeachersFreeTrialView with RequestQuoteView 2016-01-28 17:21:36 -08:00
Josh Callebaut
7b5b4ca898 Uses @$ instead of @.find, method to convert dom into jQuery objects, and superior CoCoModel's getOwner() instead of trawling through the permissions list 2016-01-28 14:05:04 -08:00
Josh Callebaut
4a2d5c2e59 Fixes level ownership check 2016-01-28 14:05:04 -08:00
Josh Callebaut
bd825d3108 Includes the level name in the email and makes it clickable 2016-01-28 14:05:04 -08:00
Josh Callebaut
42efe6264b Sticks the level submission data into the contact form's message attribute 2016-01-28 14:05:04 -08:00
Josh Callebaut
8347c8247f Merge branch 'master' of https://github.com/codecombat/codecombat 2016-01-28 13:57:56 -08:00
Scott Erickson
4ef5f40fa1 Network error handling fixes 
* Make work there are multiple network requests and only one fails
* Test for i18n attributes instead of English translations so Travis works
* Various PR changes
 2016-01-27 10:42:12 -08:00
Scott Erickson
3dda5710de Move demo border to TestView to be used generally 2016-01-27 10:42:02 -08:00
Scott Erickson
d00f8344be Add demo controls to TestView 2016-01-27 10:42:02 -08:00
Scott Erickson
29350bf1de Make network error handling more generic 2016-01-27 10:41:56 -08:00
Matt Lott
78c86eb979 Add furthest course table to analytics page 2016-01-26 14:37:25 -08:00
Nick Winter
4ae8eacd90 Treat Elemental Wars like Ace of Coders for mirror match and hero equipment 2016-01-26 13:20:23 -08:00
Matt Lott
b3e5d8f650 Add explicit track event for viewing teacher trial 
We want to explicitly track views before submit.
 2016-01-26 10:32:39 -08:00
Scott Erickson
277c526dc3 Add CourseVictoryModal 2016-01-25 13:03:29 -08:00
Josh Callebaut
6dfc02980a Fixes non-existant task array, bad focus, adds a button to add default tasks. 2016-01-22 13:54:20 -08:00
Rob Blanckaert
28d085f6d3 Merge pull request #3349 from ryang217/master 
Add additional formatting tags to Tome popup
 2016-01-22 13:22:56 -08:00
Robin Yang
dc248f8d29 Add additional formatting tags to Tome popup 
Helps fix this #2945
 2016-01-22 13:21:17 -08:00
Cat Sync
96003dd240 filter deleted users out of ClassroomView 2016-01-22 14:32:39 -05:00
Cat Sync
e4296eaf97 filter out empty solutions when clicking Fill Defaults 2016-01-22 13:41:12 -05:00
Matt Lott
1825d0e2dd Enable Mixpanel 
Closes #3347
 2016-01-21 16:19:06 -08:00
Josh Callebaut
ab93dc8564 Bug fixes and style fixes. 2016-01-21 12:14:37 -08:00
Josh Callebaut
c28720c640 Implements fixes based on code review. 2016-01-20 15:32:21 -08:00
Josh Callebaut
80c2a9e539 New models with default tasks are preintialized with these tasks. 2016-01-20 10:48:53 -08:00
Scott Erickson
491a679abb Merge pull request #3327 from Imperadeiro98/master 
Cleaned couple files
 2016-01-18 15:35:59 -08:00
Scott Erickson
a28b53eb5c Merge pull request #3321 from taptapdan/fix-issue-2732 
Looks good. Thanks!
 2016-01-18 15:08:52 -08:00
Daniel Fiore
39b42fe363 Fix level list highlighted levels 
The Level Editor level list now highlights the row in which you are the
person who last saved the level. The level list now also displays
glyphicons to indicate watched/unwatched levels.
 2016-01-16 15:05:54 -08:00
Imperadeiro98
f47640e59a Cleaned couple files 
Removed some unused styles, a template, a view and changed the class
name of some views
 2016-01-16 12:07:15 +00:00
Imperadeiro98
b4b444023e Add sounds to SubscribeModal 2016-01-16 11:38:31 +00:00
Josh Callebaut
ad28be1c64 Adds casing check for unloaded/non-tasked levels. 2016-01-15 13:54:08 -08:00
Josh Callebaut
89fc6cc078 Removes stay logging, implements functionality improvements for artisan modals. 2016-01-13 17:45:27 -08:00
Josh Callebaut
14c2942134 Moves Tasks to their own tab and adds a guide-book icon next to the save icon which displays help and doubles as a level review submission modal. 2016-01-13 15:54:57 -08:00
Nick Winter
7aff24b3a6 Cleaned up a couple SubscribeModal things 2016-01-12 12:34:10 -08:00
Nick Winter
e872ead632 Implement Brazil coupon 2016-01-11 09:52:46 -08:00
Scott Erickson
a10aec256f Set upper limit to max seats you can purchase at once 2016-01-07 09:54:02 -08:00
Scott Erickson
13b9d81e4c Fix some demo views 2016-01-07 09:40:35 -08:00
Scott Erickson
5941c4b27f Add autocomplete and slider to design elements view, limit showing javascript widgets automagically 2016-01-06 16:33:50 -08:00
Scott Erickson
93b9aa3c2c Add DesignElementsView (mostly complete) 2016-01-06 16:11:28 -08:00
Scott Erickson
fde11d8f0d Add fill defaults button to solutions treema node in level editor 2016-01-06 13:50:06 -08:00
Rob
86d9b081c1 Merge branch 'cashew' 2016-01-06 12:03:49 -08:00
Nick Winter
7864d3708b Change traditional Chinese label to be in traditional Chinese 2016-01-05 15:20:22 -08:00
Daniel Fiore
a215c2e01c Fix Earned Achievements Check 2016-01-04 19:23:14 -08:00
Rob
3b4433e312 Use hero instead of this. Also use published aether package. 2016-01-04 17:23:58 -08:00
Rob
3baea9683c Additional java support. 2016-01-04 16:41:24 -08:00
CodeCombat
41a532cb50 WIP - cashew integration 2016-01-04 16:27:27 -08:00
Nick Winter
187a6f87a9 Include course info in contact message session links 2015-12-28 08:15:48 -08:00
Imperadeiro98
f369c73b2a Remove unnecessary sound 2015-12-28 16:11:09 +00:00
Imperadeiro98
bf6601c3cc Fix for GenerateTerrainModal 2015-12-26 21:56:05 +00:00
Imperadeiro98
b7ba677b00 Use view in template 2015-12-26 14:21:06 +00:00
Nick Winter
208073ffdb Fix saving levels from #3276 refactoring 2015-12-24 11:21:12 -08:00
Nick Winter
c0d58c3786 Tweak style and add i18n for #3280 2015-12-24 06:34:54 -08:00
Pulkit Agarwal
357e8c0bcd Add level to user profile page 2015-12-24 15:52:30 +05:30
Nick Winter
71fc8d5230 Don't risk destruction of level unlock links 2015-12-23 12:08:09 -08:00
Nick Winter
40da26f99c Remove misc typo. Fix NewModelModal name field focus while at it. 2015-12-23 10:33:55 -08:00
Nick Winter
08f983db59 Propagate i18n 2015-12-23 10:07:32 -08:00
Nick Winter
b42ed395c0 Small fix for #3276 NewLevelComponentModal 2015-12-23 08:41:00 -08:00
Nick Winter
6b02a7a31f Merge pull request #3276 from Imperadeiro98/master 
Use view in template
 2015-12-23 08:29:54 -08:00
Nick Winter
3be6abf2e1 Merge Router.coffee 2015-12-23 08:23:23 -08:00
Nick Winter
08d0440c71 Link to language-specific forum categories when available 2015-12-23 08:22:19 -08:00
Matt Lott
b971ce3492 Enroll single student without modal in classroom view 2015-12-21 15:45:14 -08:00
Josh Callebaut
314f8256ee Improves style further. 2015-12-21 15:42:46 -08:00
Matt Lott
bde8e6721c Add enroll students button to /courses/teachers 2015-12-21 15:04:21 -08:00
Nick Winter
e070c70b9d Put /schools into the main flow in place of anonymous /teachers for now 2015-12-21 15:02:11 -08:00
Nick Winter
2adb255a48 Merge pull request #3275 from taptapdan/fix-issue-3243 
Fix achievements notifications animation
 2015-12-21 13:32:44 -08:00
Matt Lott
11d24e939b Add smooth down arrow navigation to /schools 2015-12-21 13:00:39 -08:00
Josh Callebaut
79ff058117 Adds the Thang Task View. 2015-12-21 12:44:22 -08:00
Imperadeiro98
025d2bea2f Couple fixes 2015-12-21 16:03:28 +00:00
Imperadeiro98
e70cbed4e4 Use view in template 2015-12-21 15:51:46 +00:00
Daniel Fiore
25531477c5 Fix achievements notifications animation 
This fixes #3243. Achievement notification animation now slides in from
off-screen left and then hides back to off-screen left.
 2015-12-20 22:28:09 -08:00
Nick Winter
105c2c9497 Get prerenderedSpriteSheetData in level editor 2015-12-20 07:02:15 -08:00
Scott Erickson
079109145f Cull recruiting views and translations 2015-12-18 10:34:21 -08:00
Scott Erickson
53f8bca26b Add logoutRedirectURL property to RootView, default to /, add exceptions 2015-12-18 10:02:03 -08:00
Matt Lott
94cf5654ff Update /teachers with post-HoC copy 2015-12-18 05:39:25 -08:00
Scott Erickson
e1130ff1e8 Clean up legal string interpolation 2015-12-16 16:39:46 -08:00
Nick Winter
129d3b793d Add Mandate for modifying simulation throughput on the fly, other things later 2015-12-16 16:39:45 -08:00
Nick Winter
31eb6e6045 Fix #3017 2015-12-16 16:39:45 -08:00
Scott Erickson
3f6afa6580 Interpolate discount in year sub description 2015-12-16 16:39:45 -08:00
Scott Erickson
96e6920722 Update some copy to use db products 2015-12-16 16:39:44 -08:00
Scott Erickson
ef3f847932 Remove SubscriptionSaleView 2015-12-16 16:39:44 -08:00
Scott Erickson
a28e7bde2c Update tests for db products, some cleanup 2015-12-16 16:39:44 -08:00
Nick Winter
9821195ec9 Turn off HoC homepage play redirect 2015-12-16 16:39:44 -08:00
Matt Lott
d369c0b47c Update /schools contact us button styling 2015-12-16 16:39:43 -08:00
Matt Lott
646aa56716 /schools page 2015-12-16 16:39:43 -08:00
Scott Erickson
7c516c4d9f Move product information to the db 2015-12-14 11:10:50 -08:00
Nainufar
16033f2a5e Update DiplomatView.coffee 2015-12-13 22:28:48 +01:00
Scott Erickson
703671940f Make Facebook login only happen when user explicitly clicks to do so 2015-12-11 14:47:42 -08:00
Scott Erickson
71bca28148 Have level list in CourseDetailsView include play buttons up through the last level completed and any levels started 2015-12-11 12:59:53 -08:00
Barry
3db216a341 Fetched from master repo 2015-12-10 19:25:42 -05:00
Nick Winter
4458a57771 Save our MongoDB oplog 2015-12-10 14:51:34 -08:00
Matt Lott
0c34d06e70 🐛Remove join class refresh 2015-12-10 12:22:48 -08:00
Nick Winter
4a04a48f42 Got rid of testing ending line for indent visualizer 2015-12-10 11:11:12 -08:00
Nick Winter
608d45ba70 Don't do undefined slug collection scans 2015-12-10 09:05:34 -08:00
Nick Winter
591749de15 Fix some button child click and duplicate tag issues with e284ec79 2015-12-09 06:57:33 -08:00
Nick Winter
0945e3ee90 Merge pull request #3250 from Imperadeiro98/master 
Courses i18n
 2015-12-09 06:34:13 -08:00
Matt Lott
5ea9b6e8af Update trial requests to be type course 2015-12-08 16:16:02 -08:00
Rob
24a43f2be8 Don't show visual indent for comment ace things are blocks. 2015-12-08 14:20:23 -08:00
Imperadeiro98
e284ec7959 Courses i18n 
Also, removed duplicated 'Continue' string
 2015-12-08 20:05:08 +00:00
Matt Lott
78548b550f Disable class language change after members > 0 2015-12-07 14:36:59 -08:00
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