Nick Winter
421a63bba1
Update gridfs-stream to match new Mongo/Mongoose
2015-12-06 10:14:53 -08:00
Nick Winter
ba8a1370d9
Merge branch 'master' into production
2015-12-06 09:53:31 -08:00
Nick Winter
5a92825347
Removed nonsensical lean model set calls that don't work in new Mongoose
2015-12-06 09:53:25 -08:00
Nick Winter
5181f44c3a
Merge branch 'master' into production
2015-12-06 09:28:11 -08:00
Nick Winter
5555fdfe50
Removed some logs
2015-12-06 09:28:03 -08:00
Nick Winter
9ac89cbce1
Merge branch 'master' into production
2015-12-06 09:24:16 -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
Matt Lott
45418dbfe3
Update /courses/purchase copy
2015-12-06 07:28:16 -08:00
Matt Lott
c4c4f42e74
Update class enroll modal visuals
2015-12-06 06:27:56 -08:00
Nick Winter
28f5b9d14e
Remove extra mongoose entry
2015-12-06 05:40:54 -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
Matt Lott
e5af4d857d
Update class management enroll and assign button copy
2015-12-05 19:10:46 -08:00
Imperadeiro98
43d8a8071c
Merge pull request #3238 from Ikuyadeu/patch-1
...
Update ja.coffee
2015-12-05 20:06:07 +00:00
Imperadeiro98
551dd5d98f
Merge pull request #3237 from micman73/patch-5
...
Update DiplomatView.coffee
2015-12-05 20:01:12 +00:00
Imperadeiro98
409955cc19
Merge pull request #3236 from micman73/patch-3
...
Update el.coffee
2015-12-05 20:01:02 +00:00
Nick Winter
77731dad84
Improve server caching and ladder view refresh performance
2015-12-05 08:18:36 -08:00
Yuki Ueda
72e9838ac9
Update ja.coffee
2015-12-05 14:17:12 +09:00
Rob
47d093ec88
Don't crash if a user has no stats object.
2015-12-04 18:28:51 -08:00
Rob
668776cb1b
Build on 5.1.1 on travis.
2015-12-04 17:04:35 -08:00
Rob
c0c712064c
Update mongoose.
2015-12-04 17:01:09 -08:00
Matt Lott
77a8347b5e
Prevent double _cc classroom join
2015-12-04 16:47:52 -08:00
Rob
7bbcd705c6
Use Node 5.x
2015-12-04 16:43:15 -08:00
Matt Lott
b9af07c785
Classroom view logged out Ux
2015-12-04 16:37:13 -08:00
Matt Lott
a30caed557
Merge branch 'master' into production
2015-12-04 16:16:07 -08:00
micman73
955adc9a83
Update DiplomatView.coffee
...
two more diplomats in greek translation
2015-12-05 02:10:18 +02:00
Matt Lott
f3279863d4
Track pageviews analytics internally
2015-12-04 16:07:58 -08:00
micman73
4401af01c9
Update el.coffee
...
few additions and small correction in leaderboard section for better displaying
2015-12-05 02:04:58 +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
a573f49c98
Make unused enrollments section hidden for anonymous users in TeacherCoursesView
2015-12-04 15:02:58 -08:00
Matt Lott
1b191b1255
Merge branch 'master' into production
2015-12-04 15:00:31 -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
9edd28b67a
Update more terminology in classroom view
2015-12-04 14:53:43 -08:00
Scott Erickson
dabf317688
Update enrollment terminology in PurchaseCoursesView
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
70b1a05435
Display course name in class details view
...
Instead of campaign name
2015-12-04 14:32:22 -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
Nick Winter
6d890051a9
Merge branch 'master' into production
2015-12-04 14:07:42 -08:00
Nick Winter
b21c20c08d
Update free-trial-approved copy to not reference the confirmation email
2015-12-04 14:03:30 -08:00
Scott Erickson
7598236c21
Remove redundant lowercasing in classroom handler
2015-12-04 13:38:35 -08:00
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