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

47022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agha Awais
5fbbf2504d Merge pull request #18735 from edx/awais/remove_frading_flaky_test 
removed Grading flaky test
 2018-08-07 12:28:03 +05:00
Noraiz Anwar
41a5f99ebe Merge pull request #18729 from edx/noraiz/EDUCATOR-3292 
exempt discussion upload from xframe deny
 2018-08-07 11:56:54 +05:00
Agha Awais
4c966afc71 removed flaky test 2018-08-07 05:39:11 +00:00
Jeremy Bowman
b386198a48 Merge pull request #18717 from edx/jmbowman/TE-2663 
TE-2663 Run bok-choy tests in headless Firefox
 2018-08-06 12:45:59 -04:00
Diana Huang
23860605f0 Merge pull request #18699 from edx/mikix/visible_date 
Fix visible dates sent to Credentials
 2018-08-06 10:49:30 -04:00
Jeremy Bowman
f1b2435437 Merge pull request #18721 from edx/jmbowman/TE-2524 
TE-2524 Stop using nose.plugins - openedx
 2018-08-06 10:22:18 -04:00
noraiz-anwar
dd9e10f750 exempt discussion upload from xframe deny 2018-08-06 16:31:49 +05:00
Noraiz Anwar
4535f3f463 Merge pull request #18701 from edx/noraiz/EDUCATOR-3074 
setting xframe_options to deny
 2018-08-06 16:02:54 +05:00
noraiz-anwar
45d1ce6d07 setting xframe_options to deny 2018-08-06 15:28:31 +05:00
edX Transifex Bot
90e3270fd0 Update translations 2018-08-05 17:28:09 -04:00
Spencer Hance
92030ea152 Merge pull request #18719 from edx/spencerhance/learner-profile-contrast 
Fixes a11y contrast of records button on learner profile page
 2018-08-03 17:49:26 -04:00
Agha Awais
0acb2289e1 Merge pull request #18688 from edx/awais/lett_2_bc_advance_settings_III 
advanced settings bokchoy tests III
 2018-08-04 00:52:29 +05:00
Agha Awais
202e990498 Merge pull request #18686 from edx/awais/lett_2_bc_grading_II 
Grading bokchoy tests II
 2018-08-04 00:52:09 +05:00
Diana Huang
718c6a9340 Test fixes for branch. 2018-08-03 15:37:52 -04:00
Michael Terry
caaf351e63 Fix visible dates sent to Credentials 
If we have a future available_date, send that to Credentials rather
than sending the modified date.

LEARNER-5995
 2018-08-03 15:37:52 -04:00
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
Agha Awais
e6a63b5693 Grading bokchoy tests II 2018-08-03 12:09:21 +00:00
Agha Awais
be5ccf92e7 advanced settings bokchoy tests III 2018-08-03 12:06:23 +00:00
Qubad786
3e3098074d Unpin edxval from base.in 2018-08-03 12:46:44 +05:00
Jeremy Bowman
c290bf8a07 TE-2524 Stop using nose.plugins - openedx 2018-08-02 14:54:50 -04: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
Jeremy Bowman
defc987a88 TE-2663 Run bok-choy tests in headless Firefox 2018-08-02 11:44:38 -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