Zacharias Sdregas
b9d2b7b07b
Almost Done
2015-11-12 23:07:38 +02:00
Matt Lott
e6e0617945
Tracking property for admin added course headcount
2015-11-12 12:16:40 -08:00
Rob
836a01d1a8
Pull out schema fetching, as some times we fetch schemas when we don't actually have a handler for the type.
2015-11-12 15:01:33 -05:00
Rob
234d1b5950
Bind express /db roots one at a time.
...
Don't forget about the module root!
Route maps better.
2015-11-12 14:43:50 -05:00
Nick Winter
a262dc781d
Merge branch 'master' into production
2015-11-12 11:01:10 -08:00
Nick Winter
910dd8e6b6
Use course access control for shared course hero levels
2015-11-12 11:00:54 -08:00
Nick Winter
cb101c7905
Replace simple loops while while True in course level sample code
2015-11-12 11:00:51 -08:00
Nick Winter
44fb30b81e
Merge branch 'master' into production
2015-11-12 10:25:51 -08:00
Nick Winter
fe05e66458
Give Campaigns types so that course campaigns can share hero levels
2015-11-12 10:25:25 -08:00
Nick Winter
f7f7cd683e
Allow using hero levels as course levels. Refactor current course tracking to use GET parameters.
2015-11-12 10:25:25 -08:00
Scott Erickson
8b00c38350
Merge pull request #3168 from Imperadeiro98/use-view
...
Refactor to use view in template for issue #3138
2015-11-12 09:58:49 -08:00
Matt Lott
df57e99957
Don't block videos in guide for course levels
...
https://app.asana.com/0/54269205393657/61779149610165
2015-11-12 06:05:21 -08:00
Zacharias Sdregas
ca0e5af481
Some more translated
2015-11-12 15:03:07 +02:00
Matt Lott
5ca68ff682
🐛 Fix analytics dashboard date oboe
2015-11-11 20:21:35 -08:00
Nick Winter
29892a9619
Add user country to contact messages
...
https://app.asana.com/0/54275583589675/64698696631078/f
2015-11-11 15:43:25 -08:00
Nick Winter
b9deb363d2
Add Brazil office address
2015-11-11 10:33:21 -08:00
Nick Winter
2f2d32d843
Merge branch 'master' into production
2015-11-11 09:07:26 -08:00
Nick Winter
fae1411e3a
Fix hourOfCode initialization for unregistered players with inconsistent system time or coming to /hoc after 5 minutes
2015-11-11 09:07:16 -08:00
Zacharias Sdregas
88eeb2b3b7
some 250 more strings translated
2015-11-11 18:16:41 +02:00
Nick Winter
5752aead2f
Merge branch 'master' into production
2015-11-11 07:41:58 -08:00
Nick Winter
f6307ac04e
Made while True snippets work in course levels
2015-11-11 07:41:52 -08:00
Nick Winter
24cf607421
Merge branch 'master' into production
2015-11-11 06:42:21 -08:00
Nick Winter
42b53dff20
Fix camera and spectate bugs with new loading intro behavior
2015-11-11 06:42:12 -08:00
Imperadeiro98
18eef3b0ec
Merge pull request #3171 from probil/patch-4
...
Update ukrainian l18n
2015-11-11 14:25:34 +00:00
Imperadeiro98
a36220694a
Indentation fix
2015-11-11 14:25:17 +00:00
Imperadeiro98
871738ecdb
Merge pull request #3134 from janjoos/patch-2
...
Smart update
2015-11-11 14:24:41 +00:00
Nick Winter
6bf61dab39
Merge branch 'master' into production
2015-11-11 05:53:17 -08:00
Nick Winter
0dc0b51556
Hid loading intro scroll for now, bad scroll bars.
2015-11-11 05:53:01 -08:00
Matt Lott
1c0550ff9f
🐛 Fix admin analytics date bugs
2015-11-10 17:26:15 -08:00
Scott Erickson
d9d5dce2e0
Merge branch 'master' into course-correction
2015-11-10 16:34:33 -08:00
Scott Erickson
e429d97f33
Add course-correction migration script
2015-11-10 16:34:00 -08:00
Scott Erickson
30e05f3720
Restrict prepaids
...
* For GET prepaids, ignore prepaids made before today
* For POST prepaid redeemer, do not allow redeeming users made before today
* For POST prepaid redeemer, disable db query for being a member of a different prepaid (not relevant since no one had paid before)
* For POST prepaid redeemer, only allow for prepaids of type course
2015-11-10 16:32:31 -08:00
Nick Winter
7e433b9e12
Use ?intro=true to show intro screen even after level completion
2015-11-10 16:09:21 -08:00
Scott Erickson
5c5db0e546
Remove named plugin from classroom
...
Since we're sourcing from course instances which did not have such a limitation
2015-11-10 16:08:18 -08:00
Nick Winter
2259076800
LoadingScreen -> level intro behavior
2015-11-10 15:22:09 -08:00
Nick Winter
4497334e6d
Update a couple team avatar and descriptions
2015-11-10 15:21:34 -08:00
Matt Lott
717377eb43
Update analytics aggregation script
...
Giving preference to payments created field over _id date.
2015-11-10 14:55:48 -08:00
Matt Lott
e33323e7eb
Add line charts to admin analytics dashboard
...
https://app.asana.com/0/54276215890539/64369256136957
2015-11-10 14:55:48 -08:00
Max Lyashuk
f69d28b8cb
Update ukrainian l18n
...
Translated more lines, fix wrong translations, fix language specific things
2015-11-11 00:41:07 +02:00
Scott Erickson
cddf000276
Add way for admins to grant users course prepaids
2015-11-10 14:33:27 -08:00
Nick Winter
5e4fccf775
Merge pull request #3170 from Zerrien/master
...
Adds Josh C's image and updates the about page.
2015-11-10 13:58:10 -08:00
Josh Callebaut
c4779468bd
Adds Josh C's image and updates the about page.
2015-11-10 13:46:48 -08:00
Scott Erickson
a0212da789
Improve StudentCoursesView
...
* Add alert explaining when a user joins a course, and links directly to the course
* Add header to My Courses list
* Have My Courses list sorted by classroom creation then course creation
2015-11-10 12:08:44 -08:00
Scott Erickson
4561ff42ce
Update prepaid course price
2015-11-10 11:37:21 -08:00
Scott Erickson
b63daf5a18
Guard against prepaid maxRedeemer properties being strings
2015-11-10 11:27:46 -08:00
Zacharias Sdregas
5491bf4860
318 more strings translated
2015-11-10 17:42:55 +02:00
Zacharias Sdregas
0c8f8e3d78
Greek Translation - A few more string translated
2015-11-10 07:23:04 +02:00
Scott Erickson
0c5b39e029
Merge branch 'master' into course-correction
...
Some package scripts got in the way of each other
2015-11-09 18:18:02 -08:00
Scott Erickson
12b3947448
Tweak wording on TeacherCoursesView
2015-11-09 18:14:42 -08:00
Scott Erickson
c8fc893ef1
Adjust CourseDetailsView for classrooms
...
* Disable settings modal
* Show classroom name instead of course instance name if available
2015-11-09 18:08:39 -08:00