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

46986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waheed Ahmed
0c72e4ee6c Merge pull request #18712 from edx/waheed/LEARNER-6002-exempt-xfram-options-for-xblock 
Exempt xblock renderer from xframe options deny.
 2018-08-02 19:33:40 +05:00
Awais Jibran
e1d27d56f8 Merge pull request #18692 from edx/aj/fix-single-blackout-date 
Fix discussion blackout date pasrsing.
 2018-08-02 18:58:23 +05:00
Waheed Ahmed
c9d45c8698 Exempt xblock renderer from xframe option. 
LEARNER-6002
 2018-08-02 18:02:16 +05:00
Agha Awais
6e77a2ee2b Merge pull request #18713 from edx/awais/removed_lettuce_tests_for_discussions 
removed lettuce test points for discussion component
 2018-08-02 17:57:17 +05:00
Agha Awais
469d871994 Merge pull request #18702 from edx/awais/lett_2_bc_textbook 
bokchoy tests for textbook page
 2018-08-02 16:43:41 +05:00
Qubad786
f3cc03007f Bump edxval version 2018-08-02 15:16:54 +05:00
Jeremy Bowman
8a558902e0 Merge pull request #18705 from edx/feanil/make_ugprade_and_update_django 
`Make Upgrade` + Update Django to latest patch version.
 2018-08-01 18:41:25 -04:00
Feanil Patel
d5dfbb77aa Run make upgrade but leave pytest behind for now. 
There are issues in the newest version that we don't want to pick up yet.
 2018-08-01 17:10:10 -04:00
Brandon Baker
1824ca2657 Merge pull request #18710 from edx/bbaker/fix-award-certificate-error-handling 
Add better http error handling to award program certificate
 2018-08-01 16:17:33 -04:00
Brandon Baker
2f8c5af246 Add better http error handling to award program certificate 2018-08-01 15:42:56 -04:00
J Eskew
4f8e8f1a23 Merge pull request #18708 from edx/jeskew/django_upgrade_base_in 
Upgrade Django to 1.11.15 in base.in as well
 2018-08-01 15:08:42 -04:00
Feanil Patel
9f1033dcd2 Merge pull request #18707 from edx/feanil/slightly_upgrade_gunicorn 
Update gunicorn slightly.
 2018-08-01 15:04:51 -04:00
Jeremy Bowman
e5b88f864f Merge pull request #18691 from edx/jmbowman/TE-2524 
TE-2524 Stop using nose.plugins - LMS 1
 2018-08-01 12:57:29 -04:00
John Eskew
95364acd9f Upgrade Django to 1.11.15 in base.in as well 2018-08-01 12:49:19 -04:00
Feanil Patel
634544a686 Update gunicorn slightly. 
We're quite far behind, let's start by just looking at the treadmill.
 2018-08-01 12:11:50 -04:00
J Eskew
ed0dce3be5 Merge pull request #18704 from edx/jeskew/django_upgrade_1_11_15 
Upgrade Django to 1.11.15
 2018-08-01 11:52:03 -04:00
Cole Rogers
2a438df3b1 Merge pull request #18641 from edx/colelrogers/LEARNER-5922-cache-pathways 
Add credit pathway caching
 2018-08-01 11:13:44 -04:00
Brian Mesick
600c331ade Merge pull request #18696 from edx/PLAT-2268 
Add user id to partner reports
 2018-08-01 11:12:10 -04:00
John Eskew
5772506e9d Upgrade Django to 1.11.15 2018-08-01 10:59:13 -04:00
Ned Batchelder
74c6c7aa75 Merge pull request #18638 from open-craft/jill/reinstate-enrollments-admin 
Gate access to the CourseEnrollmentAdmin view with a waffle switch
 2018-08-01 10:35:31 -04:00
Brandon Baker
13570232f7 Merge pull request #18697 from edx/bbaker/LEARNER-6004 
Properly handle errors in award program certificates
 2018-08-01 10:25:13 -04:00
Cole Rogers
1c05308d4a Add credit pathway caching 2018-08-01 10:18:10 -04:00
Brandon Baker
101714bd0e Properly handle errors in award program certificates 
LEARNER-6004
 2018-08-01 09:52:05 -04:00
Agha Awais
ea06bb8b4d removed lettuce tests for discussion component 2018-08-01 12:53:05 +00:00
Agha Awais
2f94817118 bokchoy tests for textbook page 2018-08-01 12:42:47 +00:00
Agha Awais
a3f8fe49cb Merge pull request #18690 from edx/awais/lett_2_bc_discussion_components 
discussion component bokchoy tests
 2018-08-01 16:44:54 +05:00
Awais Jibran
cab6c9fcbd Fix discussion blackout date pasrsing. 
EDUCATOR-3260
 2018-08-01 16:31:11 +05:00
Waheed Ahmed
90b2751997 Merge pull request #18689 from edx/waheed/LEARNER-6002-exempt-xfram-options-for-render-xblock 
Exempt render_xblock from xfram options.
 2018-08-01 13:29:35 +05:00
Nimisha Asthagiri
9e6d421db0 Merge pull request #18698 from edx/arch/update-drf-extensions 
Update edx-drf-extensions version
 2018-07-31 17:12:03 -04:00
Nimisha Asthagiri
fb30f9a29b Update edx-drf-extensions version 2018-07-31 16:24:19 -04:00
Brian Mesick
a24d612c47 Merge pull request #18693 from edx/bmedx/PLAT-2267 
Fix timezone issues in retirements_by_status_and_date
 2018-07-31 15:25:07 -04:00
bmedx
bb799053ed Add user id to partner reports 2018-07-31 14:43:33 -04:00
bmedx
a0e9ddcf8c Fix timezone issues in retirements_by_status_and_date 2018-07-31 13:26:23 -04:00
Michael Roytman
e5521d9ec2 Merge pull request #18661 from edx/mroytman/bok-choy-tests-course-outline 
bok choy tests for course outline status section
 2018-07-31 13:08:31 -04:00
Jeremy Bowman
ca3316962d TE-2524 Stop using nose.plugins - LMS 1 2018-07-31 13:03:18 -04:00
Attiya Ishaque
6e878bf263 Merge pull request #18659 from edx/ai/EDUCATOR-2588-moderator 
Fix forums threads load issue in the user view.
 2018-07-31 21:03:31 +05:00
Michael Roytman
7e8de93d05 bok choy tests for course outline status section 2018-07-31 12:00:44 -04:00
Jeremy Bowman
077b9f1a61 Merge pull request #18682 from edx/jmbowman/TE-2524 
TE-2524 Stop using nose.plugins in common/djangoapps and common/lib
 2018-07-31 10:57:10 -04:00
Agha Awais
a72beed4ec discussion component bokchoy tests 2018-07-31 14:29:49 +00:00
Waheed Ahmed
33edc71dc1 Exempt render_xblock from xfram options. 
Exempt render_xblock from xfram options otherwise, mobile apps, LTI
and other apps that iFrame our course-blocks won't work.

LEARNER-6002
 2018-07-31 18:39:06 +05:00
Ahsan Ul Haq
ae65cee717 Merge pull request #18687 from edx/ahsan/LEARNER-5967-Investigate-excessive-program-cache-miss 
Updated log to check which site cache are miss
 2018-07-31 17:59:56 +05:00
Ahsan Ulhaq
c7794142d4 Updated log to check which site cache are miss 
LEARNER-5967
 2018-07-31 17:16:11 +05:00
edX Transifex Bot
94e71b1800 Update translations 2018-07-31 05:12:40 -04:00
Jeremy Bowman
4241249119 TE-2524 Stop using nose.plugins 2018-07-30 21:11:05 -04:00
Nimisha Asthagiri
f098633cee Merge pull request #18681 from edx/arch/generate-keys-command 
Management command: generate_jwt_signing_key
 2018-07-30 17:10:41 -04:00
Michael Terry
3222d3fd13 Site config flag for Learner Records 
Allow site admins to disable integration for the Learner Records
feature in Credentials.

LEARNER-5987
 2018-07-30 16:18:24 -04:00
Nimisha Asthagiri
ae9b8956e0 Management command: generate_jwt_signing_key 2018-07-30 16:09:46 -04:00
Awais Jibran
a70a62feda Merge pull request #18666 from edx/aj/a11y/course-outline-verified-cert-btn 
Learn About Verified Certificates button on course outline page needs a focus indicator
 2018-07-30 23:54:33 +05:00
Brandon Baker
67945fa3ef Change styling on view program record button in program detail sidebar 2018-07-30 14:50:38 -04:00
Troy Sankey
9ad65031a0 Merge pull request #18662 from edx/pwnage101/add-created-field-to-partner-report-serialization 
Add created field to UserRetirementPartnerReportSerializer
 2018-07-30 13:33:32 -04:00