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

46829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Raposa
02d5477aaa Merge pull request #138 from edx/robrap/EDUCATOR-3206 
EDUCATOR-3206: Fix chemical equations.
 2018-07-25 10:22:50 -04:00
Michael Youngstrom
9337963c59 Merge pull request #18562 from edx/youngstrom/xdist-container-setup 
Add prepare_xdist_nodes script and git ignore xdist txt files
 2018-07-18 12:17:06 -04:00
Michael Roytman
78fb0c1306 Merge pull request #18601 from edx/mroytman/enabled-launch-checklist-for-all 
enable course launch checklist for all staff
 2018-07-18 11:54:26 -04:00
Michael Youngstrom
28d0c4cb18 Add prepare_xdist_nodes script and git ignore xdist txt files 2018-07-18 11:40:42 -04:00
Michael Roytman
648d5cda3b enable course launch checklist for all staff 2018-07-18 10:00:00 -04:00
Ayub-khan
7f1f3b0dad Merge pull request #18602 from edx/update-translations-18-july 
Updated Translations
 2018-07-18 15:51:45 +05:00
ayub-khan
3e47ade19e Updated Translations 2018-07-18 14:38:00 +05:00
Braden MacDonald
79af9c175f Merge PR #17824: UI to select a problem location for use in data download 2018-07-17 16:44:37 -04:00
Robert Raposa
0840fe8e5c Escape chemical equation in advanced problems. 
EDUCATOR-3206
 2018-07-17 16:01:41 -04:00
Kshitij Sobti
fcff921fdb Linting fixes to improve quality report 2018-07-18 00:37:31 +05:30
Kshitij Sobti
bf6af13ed1 Add UI to browse and browse course structure and select the course/chapter/section... to generate a report of 2018-07-18 00:37:29 +05:30
Eric Fischer
b7d16b90f8 Add jest snapshot testing 2018-07-18 00:37:25 +05:30
Uzair Rasheed
4b4a8632bb Merge pull request #18598 from edx/refactor-code-of-LEARNER-5257 
Refactor Code for LEARNER-5257
 2018-07-17 20:24:27 +05:00
Fred Smith
f89da03922 Merge branch 'private_to_public_04030f5' 2018-07-17 10:26:09 -04:00
Feanil Patel
7eede09267 Merge pull request #18560 from edx/lduarte1991-annotations_deprecation 
Lduarte1991 annotations deprecation
 2018-07-17 10:20:49 -04:00
Uzair Rasheed
0c610749c9 Refactor Code for LEARNER-5257 
Course key object was not serializable before sending to celery
task.
 2018-07-17 18:20:39 +05:00
Tasawer Nawaz
9d29f07d2d Merge pull request #18594 from edx/tasawer/learner-4467/fix-exception-handling-in-award-program-certificate-task 
Fix exception handling in award program certificate task
 2018-07-17 10:38:27 +05:00
lduarte1991
a9b61c06d3 Remove the annotations feature introduced by Harvard. 
There are other annotations features still in the platform but this one
is the one that works with an annotations server that was specialized
and not generally used by most instances of the platform.

The initial PR to remove this was made by 'lduarte1991' and can be found
here: https://github.com/edx/edx-platform/pull/17299

The work done based on the squashed commits:
removed advanced modules config for annotations
remove module files and config for annotations
remove js and css files related to annotations, under ova folders
removed js and css annotator file configs for cms and lms
remove template html files for annotations
removed annotations options from static html book
Added back some files that were originally marked "for OVA" but others used as per acceptance tests
Added back css file configs incorrectly marked as ova
Remove annotation related advanced settings from test.
Correct hls require.js pathing.
 2018-07-16 16:55:08 -04:00
Jeremy Bowman
507d5e38de Merge pull request #18592 from edx/jmbowman/INCR-18 
INCR-18 Upgrade django-config-models for Python 3 support
 2018-07-16 12:55:45 -04:00
adeel khan
7b8567bef8 Merge pull request #18567 from edx/adeel/learner_5566_course_list_view_slow_transaction 
Improve CourseListView end point latency by removing CourseWaffleFlag.
 2018-07-16 21:37:46 +05:00
Robert Raposa
c1b921d700 Merge pull request #18589 from edx/robrap/ARCH-164-add-oauth-dispatch-metrics 
ARCH-164: Add oauth_dispatch metrics.
 2018-07-16 12:07:05 -04:00
Tasawer Nawaz
87ddb56bbb fix exception handling in award program certificate task 
LEARNER-4467
 2018-07-16 18:31:55 +05:00
edX Transifex Bot
46e40ac6f5 Update translations 2018-07-16 04:58:23 -04:00
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
Robert Raposa
5738086c17 Add oauth_dispatch metrics. 
ARCH-164
 2018-07-13 13:57:11 -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
Adeel Khan
5a730aa934 Improve CourseListView end point latency by removing CourseWaffleFlag. 
This patch would remove CourseListView slow transaction by changing
CourseWaffleFlag to WaffleFlag. This removes extra hit on
WaffleUtil's model (WaffleFlagCourseOverrideModel).

LEARNER-5566
 2018-07-13 16:09:05 +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