Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,749 Commits 1 Branch 0 Tags
016dfd64fa4c9aa72eaaab647bc9fa351f073f9d
Commit Graph

53749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
016dfd64fa Merge pull request #23487 from edx/revert-23485-upgrade-edx-when-again 
Revert "Upgrade edx-when to read XBlock dates out of the read-replica"
 2020-03-24 16:34:59 -04:00
Calen Pennington
c8fcab315e Revert "Upgrade edx-when to read XBlock dates out of the read-replica" 2020-03-24 16:30:50 -04:00
Usama Sadiq
3c563e072d BOM-1404 Updated tox settings (#23439) 
Issue: https://openedx.atlassian.net/browse/BOM-1404

* Fixed Django 2.x installation process in tox
* Updated xdist worker Django installation code
* Use correct tox environment variable name

Co-authored-by: Jeremy Bowman <jbowman@edx.org>
 2020-03-24 15:06:47 -04:00
Calen Pennington
cbd875b05d Merge pull request #23485 from cpennington/upgrade-edx-when-again 
Upgrade edx-when to read XBlock dates out of the read-replica
 2020-03-24 14:41:49 -04:00
Calen Pennington
246ad6c906 Upgrade edx-when to read XBlock dates out of the read-replica 2020-03-24 13:56:43 -04:00
Adam Butterworth
a2c4b00246 Skip flaky courseware MFE redirect tests (#23483) 2020-03-24 12:50:14 -04:00
Calen Pennington
eb7b3b16e9 Merge pull request #23482 from cpennington/upgrade--edx-when 
Upgrade edx-when and edx-django-utils for better database usage
 2020-03-24 12:14:57 -04:00
Calen Pennington
576b0ec833 Upgrade edx-when and edx-django-utils for better database usage 2020-03-24 11:47:50 -04:00
Hammad Ahmad Waqas
1546198ab1 Merge pull request #23478 from edx/hammad/ENT-2580 
ENT-2580 | added sleep of 1 second in create_orders_for_old_enterprise_course_en…
 2020-03-24 17:31:54 +05:00
edX requirements bot
739ff72018 Updating Python Requirements (#23480) 2020-03-24 08:27:28 -04:00
HammadAhmadWaqas
48d9c82e0a added sleep of 1 second in create_orders_for_old_enterprise_course_enrollment command so that we should not hit ecommerce API more that 60 calls per minute. 2020-03-24 15:50:14 +05:00
edX Transifex Bot
fdc98696b1 fix(i18n): update translations 2020-03-24 13:42:44 +05:00
Alex Dusenbery
cb0ccdf242 Upgrade to ORA 2.6.21 | Reverts CSS change that may have caused PROD-1390. 2020-03-23 19:50:49 -04:00
Nathan Sprenkle
b5c688c643 Update edx-ora2 to 2.6.20 (#23475) 2020-03-23 16:22:16 -04:00
Adam Butterworth
1f59463720 Swap courseware-mfe CourseWaffleFlag with ExperimentWaffleFlag (#23429) 
TNL-7000
 2020-03-23 13:46:42 -04:00
David Ormsbee
ad2192e7fe Merge pull request #23392 from open-craft/blockstore-runtime-bug-fix 
Fix Blockstore XBlock Runtime's handling of occasional S3 errors (take 2)
 2020-03-23 09:59:54 -04:00
Robert Raposa
20c33f8686 Merge pull request #23468 from edx/jenkins/upgrade-python-requirements-c241fd6 
Python Requirements Update
 2020-03-23 09:12:27 -04:00
edX requirements bot
2945e68a2d Updating Python Requirements 2020-03-21 06:49:22 -04:00
Dillon Dumesnil
c241fd61d3 Merge pull request #23465 from edx/ddumesnil/AA-81 
AA-81: Update edx-when version
 2020-03-20 12:13:29 -07:00
adeel khan
2416f14f7f Merge pull request #23466 from edx/adeel/prod_1231_fix_video_player_button_opacity 
Reducing play button opacity to improve viewing experience.
 2020-03-21 00:03:16 +05:00
Adeel Khan
5cbcd0e952 Reducing play button opacity to improve viewing experience. 
This patch lowers the opacity for play button
enabling learners unhindered learning experience
when on video pause.

PROD_1231
 2020-03-20 23:39:07 +05:00
Dillon Dumesnil
422fcebb23 AA-81: Update edx-when version 2020-03-20 11:32:15 -07:00
Michael Roytman
458138ec6a Merge pull request #23464 from edx/mroytman/bump-edx-proctoring-2.3.3 
bump edx-proctoring version to 2.3.3
 2020-03-20 13:30:45 -04:00
Michael Terry
abc43a9352 Merge pull request #23463 from edx/mikix/verification-email-fix 
Fix error in verification email command
 2020-03-20 12:50:47 -04:00
Michael Roytman
50427ba019 bump edx-proctoring version to 2.3.3 2020-03-20 12:38:10 -04:00
Michael Terry
1aa49c93b8 Merge pull request #23456 from edx/mikix/enrollment-end 
enrollment_end support for experiments
 2020-03-20 12:17:42 -04:00
Uzair Rasheed
e8ce27c082 Merge pull request #23462 from edx/PROD-1370/update-bulk-unenroll-mgmt-cmd 
Update bulk un-enroll management command
 2020-03-20 20:59:39 +05:00
uzairr
471d7311bf Update bulk un-enroll management command 
PROD-1370
 2020-03-20 20:33:24 +05:00
Michael Terry
7999bdfbe9 Fix error in verification email command 
We are seeing an error in the send_verification_expiry_email job
because one verification model instance had a null expiry_date but
a non-null expery_email_date.

This makes us more robust to that odd data and makes the job more
robust by having it still send other emails out even if one fails.

AA-70
 2020-03-20 11:32:03 -04:00
Ahtisham Shahid
4fb1d5c235 Merge pull request #23438 from edx/ahtisham/PROD-1352 
Updated version bulk-grading
 2020-03-20 18:29:50 +05:00
Ahtisham Shahid
6f5ba859f0 updated edx-bulk-grade version 2020-03-20 18:01:06 +05:00
edX requirements bot
53c084c830 Updating Python Requirements (#23461) 2020-03-20 07:24:19 -04:00
Waheed Ahmed
02b900cf64 Remove unnecessary check. 
If `courseoverview.display_name` is set we don't get it from block
and we can remove this unnecessary check.
 2020-03-20 13:50:51 +05:00
Awais Jibran
e398d9f748 Merge pull request #23442 from edx/logs-cleanup 
Fix DeprecationWarning
 2020-03-20 11:28:52 +05:00
Simon Chen
0b90de1d94 MST-157 PART-2 Complete the functionality of searching for user info on program enrollment. The search result will be displayed on support tool's frontend. 2020-03-19 20:50:47 -04:00
Alex Dusenbery
c8d78eb3db Fix a flaky teams test - sort lists before comparison. 2020-03-19 17:49:12 -04:00
Matt Tuchfarber
48a0802b77 Merge pull request #23443 from edx/tuchfarber/MICROBA-197 
Add coaching aside to edx.org theme dashboard.
 2020-03-19 17:08:16 -04:00
Michael Terry
c4868d07bf enrollment_end support for experiments 
Now in addition to enrollment_start support in ExperimentWaffleFlag,
you can set an enrollment_end date for your experiment. All enrollments
after this date will get the control experience.
 2020-03-19 15:10:57 -04:00
Jansen Kantor
21c6d6b08d EDUCATOR-4952: Allow Users to join one team per open teamset (#23423) 
*allow users to join one team per teamset
 2020-03-19 13:56:35 -04:00
Michael Terry
4292f6567f Merge pull request #23453 from edx/mikix/num-questions-fixup 
Adjust question count logic on outline
 2020-03-19 10:42:50 -04:00
Michael Terry
7fb18c4ec9 Adjust question count logic on outline 
The question counts showed in course outlines assumed that no
blocks would both be a graded assignment and have children. That's
generally true, but this commit avoids that assumption.
 2020-03-19 10:20:30 -04:00
Michael Terry
fcd95e2eaa Merge pull request #23432 from edx/mikix/ics-fixes 
Minor fixes to ics for events
 2020-03-19 10:06:01 -04:00
edX requirements bot
97c8c609e7 Updating Python Requirements (#23450) 2020-03-19 08:53:47 -04:00
Saad Yousaf
81ab740efd Merge pull request #23408 from edx/saad/PROD-515-radio-button-change 
[PROD-515] - Update ora2 for radio button contrast change.
 2020-03-19 14:58:41 +05:00
Awais Jibran
9f74ea044b Fix DeprecationWarning 2020-03-19 14:23:46 +05:00
SaadYousaf
4cdba04bab update ora2 for radio button contrast change. 2020-03-19 13:51:12 +05:00
Dillon Dumesnil
78baddb60f Merge pull request #23445 from edx/ddumesnil/date-comment 
Adding comment about div that can't be removed.
 2020-03-18 13:11:11 -07:00
Dillon Dumesnil
9df15c9a69 Merge pull request #23446 from edx/ddumesnil/AA-74 
AA-74: Only show cert available date in Instructor paced courses
 2020-03-18 13:08:28 -07:00
Dillon Dumesnil
a13b695660 AA-74: Only show cert available date in Instructor paced courses 2020-03-18 12:41:27 -07:00
Dillon Dumesnil
b9e6fdfdef Adding comment about div that can't be removed. 
Also fixing Meta class being defined twice in one model
 2020-03-18 11:45:19 -07:00