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

49248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Roytman
df9e6c6fc9 Merge pull request #18741 from edx/mroytman/bump-studio-frontend-1.16.5 
bump studio-frontend package to 1.16.5
 2018-08-07 16:49:49 -04:00
Douglas Hall
65d9d5411e Merge pull request #18732 from edx/douglashall/upgrade_drf_extensions 
Upgrade edx-drf-extensions to 1.6.1.
 2018-08-07 16:05:50 -04:00
Michael Roytman
46cda3656b bump studio-frontend package to 1.16.5 2018-08-07 15:47:34 -04:00
Douglas Hall
6e9d71f44c Upgrade edx-drf-extensions to 1.6.1. 2018-08-07 15:19:20 -04:00
Jeremy Bowman
02e4b87421 Merge pull request #18733 from edx/jmbowman/TE-2525 
TE-2525 nose.tools removal part 1/2
 2018-08-07 13:55:04 -04:00
J Eskew
6ee6e8935b Merge pull request #18711 from edx/jeskew/mgmt_cmd_cancel_user_retirement 
Mgmt command to cancel user retirement request.
 2018-08-07 12:03:11 -04:00
Jeremy Bowman
4b13ad577b Merge pull request #18731 from edx/jmbowman/TE-2524 
TE-2524 Remove remaining nose.plugins usage
 2018-08-07 10:34:54 -04:00
Jeremy Bowman
7e410b0656 TE-2524 Remove remaining nose.plugins usage 2018-08-07 09:36:35 -04:00
Jeremy Bowman
bcaec3c5bb TE-2525 nose.tools removal part 1/2 2018-08-07 08:30:12 -04:00
Noraiz Anwar
70d1ca4740 Merge pull request #18736 from edx/noraiz/EDUCATOR-3074_lms_setting 
set x_frame_option to deny in lms common env
 2018-08-07 17:15:53 +05:00
noraiz-anwar
22a6b08bda set x_frame_option to deny in lms common env 2018-08-07 16:42:02 +05:00
Zia Fazal
a5691b7cb6 Merge pull request #18727 from edx/ziafazal/gating-exclude-non-completable 
exclude non completable blocks when calculating completion percentage
 2018-08-07 16:39:58 +05:00
noraiz-anwar
0e005c4dd8 exempt pdf view from xframe_options:deny 2018-08-07 16:33:21 +05:00
Awais Jibran
1eba936a9e Merge pull request #18730 from edx/aj/update-log 
Update log for library not found
 2018-08-07 14:21:33 +05:00
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
John Eskew
f92a8f6e24 Mgmt command to cancel user retirement request. 2018-08-06 17:00:40 -04: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
Awais Jibran
a53a8a1f77 Update log for library not found 2018-08-06 18:20:14 +05: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
Zia Fazal
1d4b62ad6c exclude non completable blocks when calculating completion percentage 
Fixed typo
 2018-08-06 12:03:23 +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
Kevin Falcone
8594c904fe Reset to master's migrations 
I rolled back to when we added the oauth2_provider migrations and caused
deployment issues, but they were added to the bok choy cache.

Since we're re-applying those migrations, this should reset bok choy to
a point where it can run our new migrations.
 2018-08-02 14:09:57 -04:00
Kevin Falcone
5050d8c629 Revert "Updating migrations" 
This reverts commit a21b963446.
 2018-08-02 14:01:36 -04:00
Kevin Falcone
8b739fc411 Revert "Updating migrations" 
This reverts commit b890399257.
 2018-08-02 14:01:29 -04:00
Kevin Falcone
e9f6e5ab49 Revert "Updating migrations" 
This reverts commit 80d9bec5a4.
 2018-08-02 14:01:20 -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