Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,921 Commits 1 Branch 0 Tags
a6776f697397100717ea2862f738ca5044c845bf
Commit Graph

7813 Commits

Author SHA1 Message Date
cahrens
a6776f6973 Always check group access when masquerading. 
TNL-6050
 2017-01-19 14:47:10 -05:00
J. Cliff Dyer
0d2ae5d4af Store failed subsection grade calculations 
TNL-6250
 2017-01-18 09:43:07 -05:00
Ari Rizzitano
54a48a3227 [courseware] generate sequence-specific titles server-side (AC-695) 
[courseware] generate sequence-specific titles server-side (AC-695)

[courseware] generate sequence-specific titles server-side (AC-695)

case for empty subsections [AC-695]

move title logic into courseware context method [AC-695]

pep8

coffeescript -> js

js mistake

jslint

refactor sequence title generation slightly

missed a line

line too long

python is not javascript

ugh js

ugh js part 2
 2017-01-14 17:55:09 -05:00
alisan617
88e10e0ee8 sequence navs keyboard support and test update 2017-01-13 14:07:10 -05:00
Eric Fischer
4b794372cd Add registration tracks as valid bulk_email targets 
Hackathon XV project
 2017-01-12 15:05:49 -05:00
Eric Fischer
0b620ebbc1 Revert "Merge pull request #14225 from edx/efischer/tnl-6108" 
This reverts commit 8b8cf5f9e0, reversing
changes made to 2716ffbf8e.
 2017-01-12 13:50:05 -05:00
sanfordstudent
fb2173f43e Merge pull request #14322 from edx/sstudent/grading-indexes 
add index for modified to course and subsection grades
 2017-01-12 13:42:07 -05:00
Sanford Student
00471d4a78 add index for modified to course and subsection grades 
and first attempted for subsection
for TNL-6281
 2017-01-12 12:50:35 -05:00
Kevin Falcone
3f91367194 Merge pull request #14312 from edx/jibsheet/move-short-tasks-out-of-gradereport-queue 
These tasks tend to be very short but can queue behind grade reports
 2017-01-12 12:02:40 -05:00
sanfordstudent
c07f6405b9 Revert "add index for modified to course and subsection grades" 2017-01-12 10:54:35 -05:00
sanfordstudent
136355c48f Merge pull request #14311 from edx/sstudent/TNL-6281 
add index for modified to course and subsection grades
 2017-01-12 10:54:31 -05:00
Eric Fischer
6845c64977 Hide after course end 
Hijacks the existing hide_after_due field to be repected as "hide after course
end" for self-paced courses. Includes tests.

TNL-6108
 2017-01-12 09:12:54 -05:00
Kevin Falcone
4e6745f3c1 These tasks tend to be very short but can queue behind grade reports 
Here are the 3 tasks over the last 30 days with average duration
runtimes in seconds:

lms.djangoapps.instructor_task.tasks.calculate_students_features_csv 37.794393
lms.djangoapps.instructor_task.tasks.calculate_may_enroll_csv   0.030303
lms.djangoapps.instructor_task.tasks.export_ora2_data   67.629921

All but ora2 seem fine to pass through the default queue, which has 3
workers per physical machine.
 2017-01-11 17:18:45 -05:00
Sanford Student
434d403807 forgot migration 2017-01-11 15:51:20 -05:00
Sanford Student
85fb7b8ad2 add index for modified to course and subsection grades 2017-01-11 15:51:20 -05:00
Simon Chen
28e3b1cb5a Merge pull request #14297 from edx/schen/ECOM-6760 
Add the Sailthru welcome email delay
 2017-01-11 14:52:31 -05:00
Nimisha Asthagiri
05087bfac2 Management command to Reset Grades 
TNL-6251
 2017-01-10 15:26:52 -05:00
Nimisha Asthagiri
adad6b2e83 Merge pull request #14293 from edx/beryl/pre-collect-grade-report 
Grade Report: Reuse collected block structure
 2017-01-10 13:44:24 -05:00
Simon Chen
8309930bbf Add the email marketing welcome email delay ECOM-6760 2017-01-10 11:41:02 -05:00
Brian Jacobel
f58076e726 Don't hijack existing context to do this 2017-01-10 10:00:23 -05:00
Brian Jacobel
30f62203e2 Hide read state on profile pages. Add tests for read state generally 2017-01-10 10:00:23 -05:00
Nimisha Asthagiri
04d4ab0e4d Grade Report: Reuse collected block structure 2017-01-09 22:04:16 -05:00
Eric Fischer
3fd86614b0 sub_api get_score return value is a dict 
This access pattern was wrong, and was causing errors in production. I've
included an additional happy-path test.
 2017-01-09 11:50:18 -05:00
Eric Fischer
a7c2a3d926 Retry on all exceptions on failed subsection grade update 2017-01-09 11:50:18 -05:00
Jeff LaJoie
d66e323d42 TNL-6186 changes field used in CourseTeamMembership emit to be correct team_id and fixes tests 2017-01-06 08:10:31 -05:00
Simon Chen
3bda3c4a77 Remove Sailthru enrollment related signal handlers because they are being invoked from the ECOM service already. 
ECOM-6581
 2017-01-04 15:54:59 -05:00
Eric Fischer
69eae7b8fb Test for missing submission score 
Follow-up to this morning's change for TNL-6236
 2017-01-03 14:47:23 -05:00
Eric Fischer
e4d32e7fea Merge pull request #14245 from edx/efischer/none_sub_score 
Submissions scores can be too quick
 2017-01-03 14:05:01 -05:00
Christopher Lee
ac2387376d Merge pull request #14233 from edx/clee/block_id 
Added block_id to course blocks API response.
 2017-01-03 12:53:00 -05:00
Eric Fischer
033567752b Submissions scores can be too quick 
It's possible this score has not been logged yet, we should handle that.

TNL-6236
 2017-01-03 12:01:08 -05:00
christopher lee
abe396164c Added block_id to course blocks API response. 2017-01-03 10:40:16 -05:00
Gregory Martin
1b2fbbd61d delete datetext functions, implement dateutils 2017-01-03 10:18:26 -05:00
Calen Pennington
30bf20687b Merge pull request #14242 from edx/release 
Release 2016-12-22
 2017-01-03 10:11:04 -05:00
Nimisha Asthagiri
1de87f9112 Merge pull request #14213 from edx/beryl/mongocrazy 
Pre-load Definitions in Split Modulestore when accessing all blocks
 2017-01-03 09:37:40 -05:00
sanfordstudent
83bc318e37 Merge pull request #14235 from edx/sstudent/TNL-6214 
add verfication and enrollment to user profile report
 2016-12-29 19:43:25 -05:00
Sanford Student
5fd94a6698 add verfication status and enrollment mode to user profile report 
for TNL-6214
 2016-12-29 16:44:41 -05:00
Nimisha Asthagiri
99e6d53939 Preload definitions when collecting block structures 2016-12-29 08:51:26 -05:00
Awais Jibran
78790efdd8 Fix rescore TNL-6199 2016-12-29 11:22:27 +05:00
Jillian Vogel
eef4539355 Merge pull request #14153 from open-craft/jill/fix-insights-ccx-staff 
Checks access using the CCX course key instead of the base course key
 2016-12-23 08:20:24 +10:30
Dmitry Viskov
fc0577d081 Hide bookmarks link in the LTI mode 2016-12-22 09:56:33 -05:00
Calen Pennington
47e21ca5b0 Revert "Merge pull request #14078 from edx/yro_remove-datetimetext-functions" 
This reverts commit 8c0098812d, reversing
changes made to 5b6e2dd5ee.
 2016-12-22 09:29:33 -05:00
Mike Dikan
8f4cf6829a Adding support for UTM Tracking to apply to free purhases 
ECOM-6450

Updating commerce api endpoint to capture user UTM cookies and resend them in the server request to the ecommerce IDA.
Currently, the non-free purchases are tracked because the user makes the request directly on ecommerce and user cookie
contains UTM data, but for free purchases, the UTM cookie isn't sent in the background server request to the ecommerce
IDA.
 2016-12-21 19:09:56 -05:00
Jillian Vogel
8493ff6028 Checks access using the CCX course key, 
instead of using the base course key (which does not contain the CCX info).
This removes the need for special checking of CCXKey/CCXLocator types, and just
treats them like normal CourseKeys.

This fix allows users with a Staff role on a CCX course to view CCX courses in Insights.
 2016-12-22 08:37:49 +10:30
Cliff Dyer
b3051ced35 Merge pull request #14195 from edx/cdyer/save-cl-data 
Save content library selected blocks during transform phase.
 2016-12-21 16:58:10 -05:00
Nimisha Asthagiri
b90c21b138 Ensure selected blocks get saved into StudentModule when running 
transform phase

TNL-6198
 2016-12-21 15:58:41 -05:00
Calen Pennington
a24ac5155b Merge remote-tracking branch 'edx/master' into release 2016-12-21 15:01:46 -05:00
Calen Pennington
04115bfe43 Revert "Merge pull request #13235 from edx/jia/MA-2684" 
This reverts commit bde0f7b2a7, reversing
changes made to 71693c3a12.
 2016-12-21 13:21:47 -05:00
Calen Pennington
7f942bfc49 Revert "Merge pull request #14177 from edx/naa/fix-marketing-pr" 
This reverts commit dec4034bc5, reversing
changes made to ef55cc4f5f.
 2016-12-21 13:19:59 -05:00
Calen Pennington
07865ce087 Revert "Merge pull request #14187 from edx/jia/MA-3052" 
This reverts commit f7a0c1d901, reversing
changes made to dec4034bc5.
 2016-12-21 13:19:54 -05:00
sanfordstudent
e860205e67 Merge pull request #14191 from edx/beryl/content_library_access 
Test retrieving subsection grade after losing access to block in subsection
 2016-12-21 13:19:05 -05:00