Merge branch 'master' into production

This commit is contained in:
Matt Lott 2015-11-13 11:24:12 -08:00
commit 5ad9edb3d5
2 changed files with 13 additions and 3 deletions
scripts/mongodb
server/commons

View file

@ -31,12 +31,22 @@ var courses =
{
name: "Computer Science 3",
slug: "computer-science-3",
campaignID: ObjectId("55b29efd1cd6abe8ce07db0d"),
campaignID: ObjectId("56462ac4410c528505e1160a"),
concepts: ['if_statements', 'arithmetic'],
description: "Learn how to handle input.",
description: "Introduces arithmetic, counters, advanced while loops, break, continue, arrays.",
duration: NumberInt(5),
pricePerSeat: NumberInt(400),
screenshot: "/images/pages/courses/103_info.png"
},
{
name: "Computer Science 4",
slug: "computer-science-4",
campaignID: ObjectId("56462c1133f1478605ebd018"),
concepts: ['if_statements', 'arithmetic'],
description: "Introduces object literals, for loops, function definitions, drawing, and modulo.",
duration: NumberInt(5),
pricePerSeat: NumberInt(400),
screenshot: "/images/pages/courses/104_info.png"
}
];

View file

@ -34,7 +34,7 @@ module.exports.handlers =
module.exports.handlerUrlOverrides =
'analytics_log_event': 'analytics_log_event'
'analytics_perday': 'analytics.perday'
'analytics_perday': 'analytics_perday'
'analytics_string': 'analytics.string'
'analytics_stripe_invoice': 'analytics.stripe.invoice'
'level_component': 'level.component'