Scott Erickson
4403347290
Fix removing members from classrooms and course instances
2015-12-02 13:59:47 -08:00
Rob
ba2b49a5cb
Merge branch 'master' into production
2015-12-02 13:34:29 -08:00
Scott Erickson
3c1a55fc2f
Merge branch 'courses-vhoc'
2015-12-02 13:16:24 -08:00
micman73
1c31e3993d
Update el.coffee
...
small corrections on lines 265,266,274 for better display.
2015-12-02 22:56:37 +02:00
Nick Winter
28f6dd1fe1
Merge branch 'master' into production
2015-12-02 12:07:50 -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
Rob
6d4c17f724
Merge branch 'master' into courses-vhoc
2015-12-02 12:03:55 -08:00
Rob
2ecf6dfec6
Log when we prevent keystrokes so that we can solve a crazy bug.
2015-12-02 12:03:27 -08:00
Scott Erickson
7f2ddba089
Add remove student modal to ClassroomView
2015-12-02 11:56:38 -08:00
Rob
b783f6f5fe
Enable new relic support in container builds.
2015-12-02 11:16:20 -08:00
Nick Winter
a0e5126ab7
Prompt for school name on course completion
2015-12-02 10:59:55 -08:00
Rob
abfce4299c
Send unique users to perfmon
2015-12-02 10:58:02 -08:00
Scott Erickson
866900615f
Fix server tests
...
* user.email should be undefined: make sure request is made as an anonymous user
* user stats, add fix in 777eeab437e5d19e2c6da773e30f10d636f27039 from single-process-server-tests branch to master branch
2015-12-02 10:57:17 -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
Imperadeiro98
0a1e20f971
Uncommented an header from cs.coffee
2015-12-02 17:48:20 +00:00
Imperadeiro98
3174a1cbf8
Merge pull request #3226 from xsuchy/cz1
...
More Czech translations
2015-12-02 17:47:21 +00:00
Miroslav Suchý
b268006559
More Czech translations
2015-12-02 17:41:09 +01: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
6ccebba23b
Merge branch 'master' into production
2015-12-01 18:05:27 -08:00
Nick Winter
803abafa99
Added script to output all level guides for a campaign
2015-12-01 18:05:18 -08:00
Nick Winter
c0609dafd5
Stub script to organize schoolName data
2015-12-01 18:04:50 -08:00
Nick Winter
0f8a5673da
Don't save empty strings for schoolName
2015-12-01 18:04:14 -08:00
Nick Winter
da2d4507b5
Merge branch 'master' into production
2015-12-01 17:48:17 -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
93010f771a
Update available courses screenshots
2015-12-01 17:32:32 -08:00
Matt Lott
e290bf56bd
🐛 Fix /courses view class link
2015-12-01 17:32:32 -08:00
Matt Lott
b3fb8e98c2
No start new game for logged in /hoc
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
Rob
38a4ca4ec0
Load fonts locally when in development.
2015-12-01 16:47:11 -08:00
Imperadeiro98
509dd5a8f3
Update pt-PT.coffee
2015-12-01 22:28:15 +00:00
Nick Winter
2dc7800b37
Fix getting classrooms by CamelCase codes
2015-12-01 14:12:56 -08:00
Matt Lott
dcf1961b9d
Widen invite classroom modal for URL
2015-12-01 13:41:45 -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
Matt Lott
0b59d73650
Update classroom settings Learn Python copy
2015-12-01 12:43:40 -08:00
Matt Lott
d1a2b0944f
Add teachers link to /hoc
2015-12-01 12:38:54 -08:00
Matt Lott
8f7146449b
Update /courses teacher link based on logged in state
...
Go to /teachers if logged out
Go to /courses/teachers if logged in
2015-12-01 12:36:39 -08: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
Matt Lott
68e2b5bf8f
🐛 Fix /courses classroom aceConfig reference
2015-12-01 10:34:28 -08:00