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

53769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
b2cedf7312 Merge pull request #23501 from edx/ormsbee/unpin-edx-when 
Make upgrade to get the latest edx-when (1.1.3)
 2020-03-26 12:43:39 -04:00
David Ormsbee
1e8b6d5a00 Make upgrade to get the latest edx-when (1.1.3) 
Also pinned httpretty < 1.0 because that upgrade broke many tests.
 2020-03-26 12:06:27 -04:00
Calen Pennington
e867c39763 Merge pull request #23495 from cpennington/unpin-edx-when 
Unpin edx-when
 2020-03-26 09:51:39 -04:00
Nick
f37c860c87 Merge pull request #23448 from edx/ndalfonso/AA-38-calendar-sync-email-template 
AA-38 calendar sync email template
 2020-03-26 08:51:53 -04:00
Waheed Ahmed
ccbd353201 Revert "Allow Block Structures Collect to work in Studio" 2020-03-26 13:22:10 +05:00
Nicholas D'Alfonso
52309d5541 AA-38 calendar sync email template 
- create templates and methods to build/send calendar sync emails.
 2020-03-25 16:40:19 -04:00
Calen Pennington
61c1909b6c Unpin edx-when 2020-03-25 15:16:06 -04:00
edX cache uploader bot
a43edcb026 Updating Bokchoy testing database cache (#23494) 2020-03-25 15:11:34 -04:00
Calen Pennington
7340d39e5f Merge pull request #23493 from edx/revert-23487-revert-23485-upgrade-edx-when-again 
Revert "Revert "Upgrade edx-when to read XBlock dates out of the read-replica""
 2020-03-25 14:30:47 -04:00
Calen Pennington
5551ef08bf Revert "Revert "Upgrade edx-when to read XBlock dates out of the read-replica"" 2020-03-25 14:29:48 -04:00
Simon Chen
b1f61d929d MST-157 Part 3 Create the Program Enrollments Inspector tool UI and link to the Support tool index page 2020-03-25 13:08:48 -04:00
Jason Myatt
ce3f6e2b88 Merge pull request #23491 from edx/jmyatt/pin-edx-when-version 
Temporarily pin edx-when version
 2020-03-25 12:59:48 -04:00
Dave St.Germain
54b775eddc Merge pull request #23474 from edx/dcs/calculator-metadata 
Added 'show calculator' to courseware metadata
 2020-03-25 12:25:41 -04:00
Jason Myatt
78c59cdad7 Temporarily pin edx-when version 2020-03-25 11:58:15 -04:00
Awais Jibran
3ff96ef6be Merge pull request #23479 from edx/logs-cleanup 
Logs cleanup
 2020-03-25 19:53:35 +05:00
Zaman Afzal
5bff142622 Remove post_reset_login flag from the class based views. (#23452) 2020-03-25 18:49:29 +05:00
Feanil Patel
9afe536731 Merge pull request #23486 from edx/feanil/flaky_a11y 
Get rid of 2 flaky a11y tests.
 2020-03-25 09:07:02 -04:00
Awais Jibran
bb4b38b30b Do not log after sending activation email 2020-03-25 11:54:28 +05:00
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
Feanil Patel
6367962846 Get rid of 2 flaky a11y tests. 2020-03-24 16:27:32 -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
Dave St.Germain
d0914ef40c Added 'show calculator' to courseware metadata 2020-03-23 12:00:11 -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