Imperadeiro98
871738ecdb
Merge pull request #3134 from janjoos/patch-2
...
Smart update
2015-11-11 14:24:41 +00: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
Scott Erickson
628ed9a990
Remove add students tab from CourseDetailsView
2015-11-09 18:00:55 -08:00
Scott Erickson
97cb5275c3
Fixes for courses, hoc
...
* Handling prepaids with strings for maxRedeemers
* Add link to TeacherCoursesView from HourOfCodeView
* Show only course instances with classrooms attached in TeacherCoursesView and StudentCoursesView
* Add event tracking to HourOfCodeView
* Add not-logged-in handling to TeacherCoursesView
* Fixed a GET prepaids bug
* Have course instances created for hour of code have hourOfCode property set to true.
2015-11-09 17:58:40 -08:00
Scott Erickson
c8a47818c2
Initial setup of the hoc page
2015-11-09 16:45:12 -08:00
Scott Erickson
39a60f1cb7
Disabling required fields to make it easier to migrate
2015-11-09 16:07:27 -08:00
Imperadeiro98
28363f780a
Small tweaks
2015-11-09 21:35:33 +00:00
Scott Erickson
f7a41dc91a
When a student joins a classroom, they also join all course instances for that classroom which are free to join
2015-11-09 13:29:49 -08:00
Imperadeiro98
8e8a3103d5
Refactor to use view in template for issue #3138
...
This removes getRenderData from: CareersView, SaveCampaignModal,
InfiniteLoopModal, SpellListEntryThangsView, SaveLoadView,
PlaySettingsModal and JobProfileCodeModal.
2015-11-09 21:29:27 +00:00
Scott Erickson
91b8f9bb40
Switch back active tab, was switched for testing
2015-11-09 12:41:55 -08:00
Imperadeiro98
ab5038506a
Merge pull request #3167 from probil/patch-3
...
Update ukrainian l18n, fix bugs
2015-11-09 20:19:44 +00:00
Scott Erickson
1f37f12cc5
Fix auto course-instance creation
...
The interface now shows a progress bar while course instances are created for a class.
It also creates the course instances as soon as the classroom is created.
2015-11-09 12:12:10 -08:00
Scott Erickson
b0a0530d3c
Add courses tab to teacher courses page
2015-11-09 11:48:40 -08:00
Max Lyashuk
596bae17d6
Update ukrainian l18n, fix bugs
2015-11-09 21:16:01 +02:00
Zacharias Sdregas
9aa66db52d
More strings translated
2015-11-09 16:03:51 +02:00
Matt Lott
95b61c2f83
Add recurring revenue to admin analytics page
...
https://app.asana.com/0/54276215890539/59638739614287
2015-11-08 17:00:24 -08:00
Matt Lott
7861faaf93
Add active classes to admin analytics page
...
https://app.asana.com/0/54276215890539/59638739614287
2015-11-06 14:11:39 -08:00
Nick Winter
ad240152c6
Fix #3159
2015-11-06 13:00:23 -08:00
zacharias
6fc2e339de
more strings translated
2015-11-06 13:37:39 +02:00
Scott Erickson
7daff0861f
Add functionality to StudentCoursesView
2015-11-05 17:31:11 -08:00
Scott Erickson
4c4b301925
Add functionality to TeacherCoursesView
2015-11-05 17:26:31 -08:00
Scott Erickson
7d686c5194
Add Backbone events to stripe handler
2015-11-05 15:31:25 -08:00
Scott Erickson
b36bf7b171
Add PurchaseCoursesView
2015-11-05 15:30:57 -08:00
Scott Erickson
66b7bba09b
Add GET /db/prepaid?creator=:id
2015-11-05 15:29:22 -08:00
Scott Erickson
b7843b59c8
Remove courses from purchasing course prepaids
2015-11-05 14:20:24 -08:00
Scott Erickson
6b5e13501e
Allow classroom members to add themselves to course instances
...
This is so that the client will be able to add themselves to the
intro to computer science course, so that students joining classes will
have a course to enter.
2015-11-05 13:27:26 -08:00
Scott Erickson
f57cf3a83d
Make POST /db/classroom/:id/members use update to avoid race conditions
2015-11-05 13:07:36 -08:00
Scott Erickson
6de6479f3b
Add GET /db/classroom by member and GET /db/classroom/:id/members
2015-11-05 12:55:51 -08:00
