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
Matt Lott
f3be69799c
Don't link to user profiles from course details
2015-12-02 16:22:10 -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
d51f42b2ec
Update /courses/teachers with getting started pdf
2015-12-02 15:19:52 -08:00
Matt Lott
e2b2a6d396
Update /teachers
2015-12-02 15:19:52 -08:00
Scott Erickson
a201200636
Tweak /courses/teachers image styling
2015-12-02 15:08:58 -08:00
Scott Erickson
704ed75f55
Fix classroom invite link
2015-12-02 15:04:56 -08:00
Nick Winter
03e46cec22
Merge branch 'master' into production
2015-12-02 14:57:11 -08:00
Nick Winter
80253305fb
Add ?simulate=true option for testing background simulations
2015-12-02 14:57:06 -08:00
Scott Erickson
f43c3b0160
Add language icons to choose language modal
2015-12-02 14:37:09 -08:00
Scott Erickson
750086cac8
Tweak logout link copy
2015-12-02 14:30:28 -08:00
Scott Erickson
f88f4ee9ff
Tweak buttons on /hoc
2015-12-02 14:28:40 -08:00
Scott Erickson
8cc37ed034
Add recovery link to StudentLogInModal
2015-12-02 14:25:08 -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
6be512621f
Merge branch 'master' into production
2015-12-02 14:01:44 -08:00
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