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

39888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
d87d716dbd Use codejail with 15 threads 2017-01-13 11:13:51 -05:00
Ned Batchelder
57b88abf4b Merge pull request #14326 from edx/ned/allow-codejail-threads 
Allow codejail threads TNL-6291
 2017-01-12 16:57:45 -05:00
Ned Batchelder
89a13cb7cc Use a codejail change that allows threads 2017-01-12 16:42:46 -05:00
Eric Fischer
c7d2d601b8 Merge pull request #14324 from edx/efischer/revertins 
Revert #14225 hide_after_due for self-paced courses
 2017-01-12 13:55:28 -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
Calen Pennington
6e0c54ed94 Merge pull request #14321 from edx/release 
Merge pull request #14320 from edx/release-candidate
 2017-01-12 13:08:44 -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
Gregory Martin
eea2518452 Merge pull request #14299 from edx/yro_change-display-helptext 
change help strings
 2017-01-12 12:15:20 -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
a4fca6be1b Merge pull request #14319 from edx/revert-14311-sstudent/TNL-6281 
Revert "add index for modified to course and subsection grades"
 2017-01-12 11:36:15 -05:00
Calen Pennington
0dad9f61c0 Merge pull request #14320 from edx/release-candidate 
Merge release candidate to release
 2017-01-12 11:20:12 -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
8b8cf5f9e0 Merge pull request #14225 from edx/efischer/tnl-6108 
hide_after_due for self paced courses
 2017-01-12 10:25:02 -05:00
Andy Armstrong
2716ffbf8e Merge pull request #14252 from edx/andya/proctoring-transifex 
Update edx-proctoring version
 2017-01-12 10:17:51 -05:00
Andy Armstrong
f76f9d3b09 Update edx-proctoring to latest release (0.17.0) 2017-01-12 09:36:02 -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
Gregory Martin
e1e47793df change help strings 2017-01-12 09:02:28 -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
Sylvia Pearce
ec9560af48 Merge pull request #14303 from edx/sylvia/DOC-2167 
Update guidance in Studio Unit Location text
 2017-01-11 14:49:32 -05:00
Jesse Zoldak
ae4e384e17 Merge pull request #14310 from edx/revert-13914-proversity/feature-flag-for-library-creation 
Revert "Feature flag for library creation"
 2017-01-11 14:39:51 -05:00
Jesse Zoldak
ff43b823d8 Revert "Feature flag for library creation" 2017-01-11 14:35:19 -05:00
Braden MacDonald
58e3c7827a Merge pull request #13914 from proversity-org/proversity/feature-flag-for-library-creation 
Feature flag for library creation
 2017-01-11 10:56:25 -08:00
Marko Jevtić
eb60c65d0b Merge pull request #14223 from edx/douglashall/fix_staff_or_owner_api_permissions_check 
ECOM-6706 Check API View kwargs for username when checking for staff or owner permission
 2017-01-11 14:31:30 +01:00
Marko Jevtic
ba32bd0899 Fix test owner 2017-01-11 07:43:19 +00:00
Marko Jevtic
8e33ec52b5 Address comments 2017-01-11 07:09:48 +00:00
Douglas Hall
b44864b353 Check API View kwargs for username when checking for staff or owner permission 2017-01-11 07:09:48 +00:00
Nimisha Asthagiri
7849d2d92c Merge pull request #14277 from edx/beryl/grades-management-command 
Management command to Reset Grades
 2017-01-10 21:14:03 -05:00
Calen Pennington
c1759edd55 Merge pull request #14300 from edx/release 
Merge pull request #14296 from edx/cale/rc-merge-branch
 2017-01-10 16:38:18 -05:00
Sylvia Pearce
d6cf03b094 Update guidance in Studio Unit Location text 2017-01-10 16:29:08 -05:00
Nimisha Asthagiri
05087bfac2 Management command to Reset Grades 
TNL-6251
 2017-01-10 15:26:52 -05:00
Jeff LaJoie
62d129fdab Merge pull request #14298 from edx/jlajoie/TNL-6095 
Adds trailing_text id to input describedby
 2017-01-10 15:21:44 -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
Calen Pennington
6e043d97c0 Merge pull request #14296 from edx/cale/rc-merge-branch 
Cale/rc merge branch
 2017-01-10 13:37:02 -05:00
Simon Chen
8309930bbf Add the email marketing welcome email delay ECOM-6760 2017-01-10 11:41:02 -05:00
Jesse Zoldak
4a5426a6a7 Merge pull request #14289 from edx/zoldak/no-celery-retry-for-bok-choy 
Do not retry block structures tasks on bok choy servers
 2017-01-10 11:16:20 -05:00
Anthony Mangano
2d85fe4ab2 Merge pull request #14279 from edx/ECOM-5936-send-course-id-and-enrollment-track-to-zendesk-custom-fields 
Ecom 5936 enable users to select course when making support requests
 2017-01-10 10:55:51 -05:00
Brian Jacobel
6572b1df70 Merge pull request #14280 from edx/bjacobel/disc-prof-no-read-state 
Hide read state on profile pages. Add tests for read state generally
 2017-01-10 10:54:39 -05:00
Jeff LaJoie
1c0a60ebc4 TNL-6095: adds trailing_text id and adds to describedby_html, updates tests 2017-01-10 10:27:59 -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
Jesse Zoldak
c25e836128 Do not retry block structures tasks on bok choy servers 2017-01-10 09:53:15 -05:00
Jesse Zoldak
deb9e53942 Merge pull request #14295 from edx/zoldak/TE-1927 
Skip the youtube acceptance tests  TE-1927
 2017-01-10 09:27:48 -05:00
Clinton Blackburn
b14a8d6403 Updated factory-boy to 2.8.1 
ECOM-4422
 2017-01-10 09:20:05 -05:00
Jesse Zoldak
d87c9c412e Skip the youtube acceptance tests TE-1927 2017-01-10 08:21:15 -05:00
noraiz-anwar
b967538fee Merge pull request #14275 from edx/revert-14216-noraiz/TNL-6197 
Revert "Error while exporting course with too long filename"
 2017-01-10 16:01:55 +05:00