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

46791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mushtaq Ali
b5300f5e45 Fix enterprise customer catalog content filter not in settings issue. - ENT-1101 2018-07-13 16:16:47 +05:00
Ayub-khan
cf6e2d9f89 Merge pull request #18469 from edx/LEARNER-4384 
LEARNER-4384 Update intructor unenroll task
 2018-07-13 09:53:16 +05:00
Michael Terry
33590483e2 Delay less in notify_credentials 2018-07-12 17:09:01 -04:00
Robert Raposa
4312e60269 Merge pull request #18575 from edx/robrap/revert-dot-upgrade 
Revert "Upgrade DOT to 1.1.2." - Take 1
 2018-07-12 16:45:47 -04:00
Calen Pennington
201c94dbb4 Merge pull request #18568 from cpennington/cale/fix-educator-3150 
Import factories/base.js when using webpack to fix nav
 2018-07-12 15:55:01 -04:00
Calen Pennington
ccd0e344c4 Merge pull request #18572 from cpennington/fix-educator-3160 
Configure MathJax when it's loaded by XBlocks in studio
 2018-07-12 15:54:45 -04:00
Feanil Patel
71e0f3abbc Merge pull request #18559 from edx/feanil/make_upgrade 
Run `make upgrade`.
 2018-07-12 14:46:04 -04:00
Robert Raposa
4d8b9c36ae Revert "Upgrade DOT to 1.1.2." 
There was an issue with migrations on sandboxes.

This reverts commit 58f6e92
 2018-07-12 14:45:39 -04:00
Feanil Patel
d5984de2d2 Merge pull request #18574 from edx/robrap/EDUCATOR-3186-remove-flaky-test 
Remove flaky test_edit_raw_html.
 2018-07-12 13:47:08 -04:00
Feanil Patel
177007ea23 Run make upgrade. 
Tornado Changelog: http://www.tornadoweb.org/en/stable/releases/v5.1.0.html
 2018-07-12 13:31:21 -04:00
Robert Raposa
d410d6d8ff Remove flaky test_edit_raw_html. 
EDUCATOR-3186
 2018-07-12 13:08:29 -04:00
Michael Roytman
5244c48ed9 Merge pull request #18571 from edx/mroytman/bump-studio-frontend-to-1.13.0 
update studio-frontend package to 1.13.0
 2018-07-12 13:03:33 -04:00
Robert Raposa
e784f439bb Merge pull request #18570 from edx/feanil/remove_flaky_test 
Remove flaky studio unit test.
 2018-07-12 12:40:05 -04:00
Robert Raposa
73438c6c03 Merge pull request #18569 from edx/EDUCATOR-3183-remove-flaky-test 
Remove flaky test_library_content_side_bar_help.
 2018-07-12 12:34:32 -04:00
Robert Raposa
c0de877266 Merge pull request #18532 from edx/robrap/upgrade-dot 
Upgrade DOT to 1.1.2 and add paver warning.
 2018-07-12 12:02:41 -04:00
Calen Pennington
dedcd05910 Configure MathJax when it's loaded by XBlocks in studio 
When using RequireJS, MathJax was configured in an `init` function
in the RequireJS config. With the switch to Webpack and $script,
that configuration needed to be moved to the dynamic loading done by
$script.

[EDUCATOR-3160]
 2018-07-12 11:47:03 -04:00
Michael Roytman
0af5abd114 update studio-frontend package to 1.13.0 2018-07-12 11:36:16 -04:00
Michael Roytman
eebadb93db Merge pull request #18538 from edx/mroytman/EDUCATOR-3026-add-links-to-course-checklist 
mroytman/educator 3026 add links to course checklist
 2018-07-12 11:33:15 -04:00
Feanil Patel
9775af8620 Remove flaky studio unit test. 2018-07-12 11:26:19 -04:00
Michael Roytman
92c816966d change course_validation endpoint to support option to get data for only graded assignments and add ability to scroll to elements on the course outline page 2018-07-12 11:03:55 -04:00
Robert Raposa
764ea22e3d Remove flaky test_library_content_side_bar_help. 
EDUCATOR-3183
 2018-07-12 10:53:27 -04:00
Calen Pennington
19e6c992c9 Import factories/base.js when using webpack to fix nav 
factories/base.js is the library responsible for enabling the Studio nav
menu. When using webpack, we need to be sure to import it specifically,
because the webpack imports override the React code that pulls it in
on most pages.

[EDUCATOR-3150]
 2018-07-12 10:32:32 -04:00
Mushtaq Ali
a66675dc8f Merge pull request #18551 from edx/mushtaq/change-content-filter 
Change default content filter to include only courses
 2018-07-12 16:52:45 +05:00
ayub-khan
d0d3e3427e Updated intructor unenroll 
If student is in refund window, refund student,
update mode to audit, and set is_active false. if
student is not in refund window, do not refund student
do not change mode, and set is_active to false.
If professional do not change mode after refund just
change is_active to false.

-
 2018-07-12 16:01:12 +05:00
Mushtaq Ali
42342f2f6f Enterprise version bump 2018-07-12 13:06:15 +05:00
Mushtaq Ali
12011bf191 Change default content filter to include only courses 
- ENT-1070
 2018-07-12 13:01:58 +05:00
Ayub-khan
b42bd2bf7d Merge pull request #18565 from edx/fix-make-extract-translations 
Fixed make extract_translations
 2018-07-12 13:01:02 +05:00
Ayub-khan
7f773ccc82 Merge pull request #18564 from edx/remove-strict-generate 
Remove i18n-tools strict generate to fix jenkins
 2018-07-12 11:53:27 +05:00
ayub-khan
23dbb85007 Fixed make extract_translations 2018-07-12 11:32:47 +05:00
ayub-khan
6d193a4bc7 Remove i18n-tools strict generate to fix jenkins 
job to work even if some resource is not available.
 2018-07-12 11:12:45 +05:00
Robert Raposa
58f6e92522 Upgrade DOT to 1.1.2. 2018-07-11 17:36:56 -04:00
Robert Raposa
9bb8f4272e Add warning for paver install_prereqs. 2018-07-11 17:00:30 -04:00
Brian Mesick
bab76429e2 Merge pull request #18554 from edx/bmedx/PLAT-2217 
PLAT-2217 - fix partner reporting queue 500 errors, reduce log spam
 2018-07-11 16:15:19 -04:00
Michael Youngstrom
d33f84b99d Merge pull request #18468 from edx/youngstrom/xdist-scripts 
Starter code to enable pytest-xdist with remote ECS containers
 2018-07-11 14:14:30 -04:00
Michael Youngstrom
4662624165 Starter code for xdist with ecs 2018-07-11 13:23:05 -04:00
Marco Morales
464b364c70 Merge pull request #18552 from edx/marco/learner-profile/learner-menu-styling 
updated vertical alignment for learner profile menu
 2018-07-11 10:46:10 -04:00
Nimisha Asthagiri
fb6078f1ca Merge pull request #18556 from edx/arch/jwt-config 
Authn: remove unneeded oauth_dispatch views
 2018-07-11 09:12:32 -04:00
Awais Jibran
812f275436 Merge pull request #18543 from edx/aj/a11y-video-seek-issue 
Video player seek issue
 2018-07-11 17:03:59 +05:00
Attiya Ishaque
ef3ee2001c Merge pull request #18548 from edx/ai/EDUCATOR-3153-display-word-cloud 
Fix display of all words in word clouds.
 2018-07-11 14:20:20 +05:00
Uzair Rasheed
edfdbc7aee Merge pull request #18482 from edx/LEARNER-5257/update-sailthru-audit-purchase 
Update sailthru audit purchase calls
 2018-07-11 12:01:22 +05:00
Nimisha Asthagiri
66afa24bfe Authn: Remove unneeded openid-configuration View 2018-07-10 17:35:18 -04:00
Nimisha Asthagiri
c68a5a3fb6 Authn: Remove unneeded Jwks View 2018-07-10 17:35:02 -04:00
Awais Jibran
99786d9db9 Video player seek issue 
The embedded video player does not allow the screen reader user to seek forwards / backwards within the time with the keyboard as you could in the past. If you tab to play a video and press spacebar or enter, you formerly would be able to press left / right arrow to move slightly forward or backward in time, but this no longer works correctly; it will move 1 second back / forward, then you need to press tab again to refocus and move another 1 second. Other keyboard access seems to be equivalent and we suspect a slight error in the Javascript is causing this and needs to be fixed.

EDUCATOR-3034
 2018-07-11 00:45:24 +05:00
Kevin Falcone
5a9f4ea3e6 Merge pull request #18555 from edx/jibsheet/settle-DOT-expiration-timeframe 
Update token expiration for DOT tokens
 2018-07-10 15:18:07 -04:00
Michael Terry
eded3c1322 Only notify credentials of course certs 
When notifying credentials of cert/grade changes using
notify_credentials, don't worry about signaling for program cert
awards. (A) We don't need that functionality right now when
backpopulating credentials records, and (B) we have other management
commands for that anyway.
 2018-07-10 14:23:49 -04:00
Kevin Falcone
069307c925 Update token expiration for DOT tokens 
This will retire a refresh token and access token pair in the DOT tables
if the access token is 6 months expired (prior to that, the refresh
token still works).
 2018-07-10 13:36:48 -04:00
bmedx
caedc68061 PLAT-2217 - fix partner reporting queue 500 errors, reduce log spam 2018-07-10 12:54:15 -04:00
marcotuts
6b876a573a updated vertical alignment for learner profile menu 2018-07-10 12:11:35 -04:00
Rabia Iftikhar
817f1e2ef5 Merge pull request #18550 from edx/ri/edx-completion-repo-version-0.1.8 
EDUCATOR-3030 upgrade edx-completion version from 0.1.7 to 0.1.8.
 2018-07-10 20:02:28 +05:00
Qubad786
68e760ff29 Move transcript migrations tasks to low priority queue 2018-07-10 19:00:47 +05:00