Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,003 Commits 1 Branch 0 Tags
2b65fa452e42bcffbb6b59c184dc11bd412626ef
Commit Graph

47003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spencer Hance
2b65fa452e Updated Color of "View My Records" button to be a11y compliant 2018-08-03 14:44:12 -04:00
Simon Chen
d9e841298d Merge pull request #17699 from open-craft/clemente/add-coursefields-othercoursesettings 
Add CourseFields.other_course_settings to store custom fields
 2018-08-03 09:41:36 -04:00
Daniel Clemente Laboreo
1e2a69e22e Add CourseFields.other_course_settings to store custom fields 2018-08-03 15:40:06 +03:00
Qubad786
3e3098074d Unpin edxval from base.in 2018-08-03 12:46:44 +05:00
Jeremy Bowman
39ccbe3c89 Merge pull request #18709 from edx/jmbowman/TE-2524 
TE-2524 Stop using nose.plugins - LMS 2
 2018-08-02 13:45:01 -04:00
Michael Roytman
edd4bed081 Merge pull request #18695 from edx/mroytman/course-validation-default-grading-policy 
mroytman/course validation default grading policy
 2018-08-02 12:53:20 -04:00
Michael Roytman
6083a11a5e add has_grading_policy to course validation API 2018-08-02 12:17:58 -04:00
Cole Rogers
5038cfb564 Merge pull request #18706 from edx/colelrogers/LEARNER-5924-render-pathways 
Render credit pathways in program details sidebar
 2018-08-02 12:03:35 -04:00
Stu Young
6a390668d2 Merge pull request #18716 from edx/estute/TE-2660 
pass target branch to paver
 2018-08-02 11:51:35 -04:00
Daniel Clemente Laboreo
370501d156 Add feature to send an e-mail to staff when a student enrolls 2018-08-02 11:43:17 -04:00
Noraiz Anwar
d30cff2b3a Merge pull request #18715 from edx/revert-ammar/EDUCATOR-2606-thumbnail-issue-with-hls 
Revert "fix poster display issue with hls"
 2018-08-02 20:38:11 +05:00
Stuart Young
fc811aab33 pass target branch to paver 2018-08-02 11:08:17 -04:00
Nimisha Asthagiri
59a7f88bb1 Merge pull request #18714 from edx/arch/update-drf-repo 
Update edx-drf-extensions to 1.5.5
 2018-08-02 11:07:12 -04:00
Awais Jibran
62559011dc Revert "fix poster display issue with hls" 
This reverts commit b9ebe5ea686fc1b16fccd0f276fbc1d53a5c3468.
 2018-08-02 19:53:40 +05:00
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
Nimisha Asthagiri
3ea1f0e17c Update edx-drf-extensions to 1.5.5 2018-08-02 10:23:26 -04:00
Cole Rogers
40b6faf253 Render credit pathways in program details sidebar 2018-08-02 10:08:50 -04: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
4e8668d3be TE-2524 Stop using nose.plugins - LMS 2 2018-08-01 13:54:06 -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