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

46802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
9bd5f0f3e3 INCR-18 Upgrade django-config-models for Python 3 support 2018-07-13 17:19:17 -04:00
Michael Youngstrom
0fdd3bd039 Merge pull request #18573 from edx/testeng/bokchoy_auto_cache_update_45aa4f7de62a1d1222e1dceb878f07217eb0358c 
Bokchoy db cache update
 2018-07-13 14:51:55 -04:00
Brian Beggs
07a97eed61 Merge pull request #17634 from mitodl/500_progress_page_username_bug_aq 
Fixed bug involving users that could not be found using 'view this course as' functionality
 2018-07-13 13:29:46 -04:00
Michael Roytman
628954d5d7 Merge pull request #18587 from edx/mroytman/course-validation-fix-end-date 
add condition for existence of course end date to graded_only option
 2018-07-13 11:09:06 -04:00
Michael Roytman
14b59d6434 add condition for existence of course end date to graded_only option 2018-07-13 10:24:47 -04:00
edx-cache-uploader-bot
a21b963446 Updating migrations 2018-07-13 09:51:40 -04:00
Zubair Afzal
91e0c4274f Merge pull request #18582 from edx/mushtaq/fix-customer-catalog 
Fix enterprise customer catalog content filter settings value
 2018-07-13 18:11:16 +05:00
irfanuddinahmad
439f4e99e0 Merge pull request #18400 from edx/iahmad/ENT-1028-Disable-activation-email-for-learners-activated-via-SSO 
Disable activation email for SSO users
 2018-07-13 17:51:26 +05:00
Mushtaq Ali
e7362213b0 Enterprise version bump 2018-07-13 17:06:05 +05:00
Mushtaq Ali
b5300f5e45 Fix enterprise customer catalog content filter not in settings issue. - ENT-1101 2018-07-13 16:16:47 +05:00
irfanuddinahmad
ead8a78e29 disabled activation email 2018-07-13 12:48:02 +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