Commit graph

10733 commits

Author SHA1 Message Date
Nick Winter
a95b938fc5 Merge branch 'master' into production 2015-12-07 03:41:59 -08:00
Nick Winter
80b72edff1 Handling a few more server errors I saw 2015-12-07 03:41:33 -08:00
Matt Lott
5200f42722 Merge branch 'master' into production 2015-12-06 20:39:50 -08:00
Matt Lott
13c75b3f1f Condense class student progress list 2015-12-06 20:35:54 -08:00
Matt Lott
2761491517 Update HoC teacher's guide pdf 2015-12-06 20:22:53 -08:00
Matt Lott
af846db8c4 Merge branch 'master' into production 2015-12-06 20:02:07 -08:00
Matt Lott
0d752d8242 🐛Fix class student remove 2015-12-06 20:01:52 -08:00
Alessio
cebe9c7b7d Translated everything. Cool! xD 2015-12-07 04:51:41 +01:00
Matt Lott
cb608cb110 Merge branch 'master' into production 2015-12-06 16:21:44 -08:00
Matt Lott
01f6e098a1 🐛Fix /courses/purchase purchase amount 2015-12-06 16:21:08 -08:00
Barry
3ef2be1a42 0px bottom margin on panel 2015-12-06 18:36:54 -05:00
Matt Lott
a99b21c4f5 Merge branch 'master' into production 2015-12-06 15:27:58 -08:00
Barry
c107c6b099 Merge branch 'master' of https://github.com/MonkStrom/codecombat 2015-12-06 18:11:42 -05:00
Barry
74f692072e Started repositioning buttons.Can't remove box-shadow from panel 2015-12-06 18:07:41 -05: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
2650b1288a Merge branch 'master' into production 2015-12-06 12:13:55 -08:00
Nick Winter
ca1cb9a084 Don't listen to any unauthenticated requests in CourseInstanceHandler 2015-12-06 12:13:10 -08:00
Nick Winter
b1bf840d9e Merge branch 'master' into production 2015-12-06 10:14:58 -08:00
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