Commit graph

10929 commits

Author SHA1 Message Date
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
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