Commit graph

10771 commits

Author SHA1 Message Date
Matt Lott
44cd64e00e /courses analytics 2015-12-04 12:08:14 -08:00
Nick Winter
0c8a5dabb0 Merge branch 'master' into production 2015-12-04 12:06:48 -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
Scott Erickson
9d36d33051 Make fetch Classroom by code case insensitive 2015-12-04 11:30:10 -08:00
Nick Winter
16b1928fdb Default Play to /hoc route during Hour of Code week 2015-12-04 11:04:45 -08:00
Nick Winter
417d4802ee Don't show teacher name for single-player course 2015-12-04 11:04:18 -08:00
Josh Callebaut
c1ffa28aa9 Adds the start of the batchAddAchievements node script. 2015-12-04 10:27:13 -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
6a48f3697a Add link to student and teacher course pages on course details page 2015-12-04 09:40:25 -08:00
Scott Erickson
8d70b5d53f Remove course mocks 2015-12-04 09:29:14 -08:00
Matt Lott
ccbb7c6317 Merge branch 'master' into production 2015-12-04 09:28:52 -08:00
Matt Lott
6baaffd0f4 Update teacher resources pdfs 2015-12-04 09:27:06 -08:00
Scott Erickson
f72070d36b Remove #levels from link to course details view from student courses view 2015-12-04 09:26:49 -08:00
joshualu4
979f4a075a Merge branch 'master' of https://github.com/MonkStrom/codecombat 2015-12-04 12:11:27 -05:00
joshualu4
da6d07bc7d Merge remote-tracking branch 'refs/remotes/codecombat/master' 2015-12-04 12:11:08 -05:00
Imperadeiro98
ac10cc3fb2 Merge pull request #3233 from micman73/patch-3
Update el.coffee
2015-12-04 13:21:31 +00:00
Scott Erickson
3f31c9b4dd When adding and removing oneself from course instances, client locally updates me.courseInstances 2015-12-03 16:32:44 -08:00
Matt Lott
89aeac9424 Rename courses teacher resource pdfs 2015-12-03 16:30:50 -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
fac71e64c9 Add created function to CocoModel 2015-12-03 12:56:22 -08:00
Scott Erickson
f8616f7c3d Add back statsForSessions to Campaign model 2015-12-03 12:47:28 -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
055a6f7eeb Update next steps email 2015-12-03 12:25:59 -08:00
Nick Winter
7cbe679f6b Remove red color for now for indentation visualizer (#3232) 2015-12-03 12:14:42 -08:00
Scott Erickson
1bdefb3927 Fix links bleeding into course names in ClassroomView 2015-12-03 12:10:08 -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
05497f023f Add /Courses to router 2015-12-03 11:39:13 -08:00
Barry Stump
7048b2bc08 Fix up vagrant config
* Use Ubuntu 14.04 box which supports both VMWare and Virtualbox
* Correctly set memory/CPU settings for vmware_fusion provider
* Use nodesource repo instead of deprecated chris-lea PPA for installing node.js
* Upgrade npm to latest version
* Correct permissions for provisioner script (npm module install)
2015-12-03 11:39:04 -08:00
Nick Winter
3677146c4a Merge branch 'master' into production 2015-12-03 11:15:40 -08:00
Nick Winter
e3db0dea3a Add Classroom, Clan, and Achievement indexes. Fix logging for undefined slugs indentation. 2015-12-03 11:15:34 -08:00
Nick Winter
6c1f7c789a Merge branch 'master' into production 2015-12-03 10:55:27 -08:00
Nick Winter
b3edafe285 Add missing CourseInstance indexes. Log undefined slug lookups. 2015-12-03 10:55:08 -08:00
Matt Lott
1a07f392e6 Merge branch 'master' into production 2015-12-03 09:17:06 -08:00
Imperadeiro98
6460acdd3b Merge pull request #3227 from pettevi/patch-1
Update fi.coffee
2015-12-03 15:20:35 +00:00
petteri
abcea26dd7 Update fi.coffee
Added more translations
2015-12-03 10:35:34 +02:00
Matt Lott
25213c5342 Add teachers guide to /courses/teachers 2015-12-02 17:28:25 -08:00
Matt Lott
fab5388a42 🐛Fix teachers getting started guide link 2015-12-02 17:22:28 -08:00
Matt Lott
3b21567fac Add analytics to /teachers 2015-12-02 17:10:19 -08:00
Matt Lott
1d51b063c4 Merge branch 'master' into production 2015-12-02 17:00:45 -08:00
Scott Erickson
3057df0230 Have clicking the link in InviteToClassroomModal copy it 2015-12-02 16:33:24 -08:00