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

16316 Commits

Author SHA1 Message Date
mrey
9003a2dcde Allow to override COURSE_ENROLLMENT_MODES in AWS environment 
Add more parameters to COURSE_ENROLLMENT_MODES to allow to display friendly mode name and more options

Fix python tests of PR #18557

PR #18557: Fix Diff Quality test line too long

PR #18557: Fix Diff Quality test unused-variable

Use six.iteritems() in COURSE_MODE_SLUG_CHOICES for future Python 3 compatibility
 2018-09-12 17:35:57 +02:00
Awais Jibran
9cec43afb7 Merge pull request #18842 from edx/aj/fix-checklist-for-edge 
Fix edge checklist 500 error.
 2018-09-11 23:05:41 +05:00
Qubad786
71e40eb798 dont stop loading on pause 2018-09-11 19:33:25 +05:00
muhammad-ammar
d23e8a3ed8 fix poster display issue with hls 
EDUCATOR-2606
 2018-09-11 19:33:25 +05:00
Agha Awais
719aa4c5cb Merge pull request #18909 from edx/awais/lett_2_bc_grading_III 
Grading bokchoy tests III
 2018-09-11 11:06:46 +05:00
Braden MacDonald
6c599cc153 Merge pull request #18855 Output a list of replaced static paths 2018-09-10 20:03:59 -07:00
Usman Khalid
ca910b6f27 Collect static asset URLs from static_replace.replace_static_urls 
Allows users to keep track of which static asset URLs were found in given text,
and what they were replaced from/to.
 2018-09-11 11:16:33 +09:30
Simon Chen
af3e5ba4c3 Merge pull request #18149 from mitodl/pdpinch/expose-attempts 
Expose attempt number to python custom grader
 2018-09-10 15:50:28 -04:00
Agha Awais
6c45b236ab Grading bokchoy tests III 2018-09-10 19:39:53 +00:00
Awais Jibran
3bb34faa8f Fix edge checklist 500 error 
EDUCATOR-3355
 2018-09-10 16:30:13 +05:00
shadinaif
80039ab028 This is to upgrade the ddt package from the old 0.8.0 version to the latest version that supports Python3 
(version 1.2.0 as of this commit)

This commit is intended to close INCR-6 issue (see https://openedx.atlassian.net/browse/INCR-6 )
 2018-09-10 11:33:05 +03:00
Robert Raposa
ba4cc62ff8 Retire deprecated RequestCache (Take 2) 
ARCH-223
 2018-09-08 15:09:28 -04:00
Asad Iqbal
655d6abea8 Merge pull request #18745 from edx/asadiqbal08/ENT-769 
[ENT-769] - Unlink learner from Enterprise Customer
 2018-09-06 15:02:50 +05:00
Robert Raposa
7e2c08e6b4 Merge pull request #18890 from edx/robrap/remove-flaky-video-test 
EDUCATOR-3417: Remove flaky video test.
 2018-09-05 16:42:46 -04:00
Robert Raposa
366486fc6a Remove flaky completion test. 
* test_render_xblock_publish_completion_is_sent_on_view
 2018-09-05 14:40:51 -04:00
Robert Raposa
69204d5a61 Remove flaky video test. 
* test_video_language_menu_working
 2018-09-05 14:36:11 -04:00
Robert Raposa
5b49a8e926 Merge pull request #18887 from edx/robrap/remove-flaky-completion-test 
EDUCATOR-3409: Remove flaky completion test.
 2018-09-05 11:48:20 -04:00
Robert Raposa
d3d270f829 Remove flaky completion test. 
* test_courseware_publish_completion_is_sent_on_view
 2018-09-05 11:01:37 -04:00
Calen Pennington
139d40b76b Merge pull request #18854 from cpennington/cale/edu-3262-logging 
Log conditional xblock fragment resource loading
 2018-09-05 10:40:49 -04:00
Qubad786
89925a96dc use waffle_flags from video pipeline and fix tests 2018-09-04 19:07:03 +05:00
muhammad-ammar
809175d4cf add support to enable/disable hls as primary playback 
EDUCATOR-2714
 2018-09-04 19:07:03 +05:00
Waheed Ahmed
711343a7c7 Fix entitlement expiring on switching session. 
LEARNER-6313
 2018-09-04 11:38:58 +05:00
asadiqbal
0dbdac3262 Unlink learner from Enterprise Customer when learner unlinks from IDP 2018-09-04 11:07:53 +05:00
David Ormsbee
ebbd262710 Modify forum roles query for Aurora performance. 
This is a fix for the performance issues in EDUCATOR-3374

AWS's Aurora backend for MySQL selects the wrong index on the
django_comment_client_role_users table, leading to performance issues.
This commit replaces that join with individual requests for permissions
for each role (of which there may be several for any given user).
It's dumber SQL, but Aurora will do the right thing.
 2018-08-31 16:34:53 -04:00
Kevin Falcone
a358b212bb Merge pull request #18859 from edx/aed/revert-first-try 
Revert "EDUCATOR-3374 | Hacky query to fix inline discussions performance."
 2018-08-30 17:24:12 -04:00
Alex Dusenbery
e707804670 Revert "EDUCATOR-3374 | Hacky query to fix inline discussions performance." 
This reverts commit 4a1caf6c03.
 2018-08-30 16:40:49 -04:00
Alex Dusenbery
d9f60cba7a Add a (user_id, role_id) index to dcc_role_users table. 2018-08-30 16:40:25 -04:00
Nimisha Asthagiri
4ca165f690 Revert "ARCH-223: Retire deprecated RequestCache." 2018-08-30 16:33:03 -04:00
Jolyon Bloomfield
9981b153b3 Remember to add changes before committing... 2018-08-30 16:22:50 -04:00
Jolyon Bloomfield
28e64d95cc Handle situation where attempts have been reset to 0 and problem is regraded; Update comments 2018-08-30 16:21:23 -04:00
Peter Pinch
3763d26651 clarify comments 2018-08-30 15:57:42 -04:00
Nimisha Asthagiri
8459982512 Merge pull request #18847 from edx/robrap/ARCH-223-replace-request-cache 
ARCH-223: Retire deprecated RequestCache
 2018-08-30 12:59:49 -04:00
Robert Raposa
3df339a56a Retire deprecated RequestCache. 
ARCH-223
 2018-08-30 08:55:19 -04:00
Alex Dusenbery
4a1caf6c03 EDUCATOR-3374 | Hacky query to fix inline discussions performance. 2018-08-29 20:17:54 -04:00
Calen Pennington
8878edea26 Log conditional xblock fragment resource loading 2018-08-29 13:46:17 -04:00
rabiaiftikhar
72cba77bbb EDUCATOR-3030 donot submit completion for grader's response while updating problem score. 2018-08-29 16:04:28 +05:00
Peter Pinch
ddd8d41906 expose attempts to python custom grader 2018-08-27 11:49:55 -04:00
Waheed Ahmed
e3dbfe9c0f Fix refund entitlement on audit course un-enroll. 
LEARNER-6247
 2018-08-27 17:47:59 +05:00
Michael Youngstrom
324ddfbeda Re add test_login_failure 2018-08-24 15:18:13 -04:00
Michael Youngstrom
b614c19e16 Merge pull request #18833 from edx/youngstrom/bok-choy-flaky 
Remove flaky bok-choy tests
 2018-08-24 15:06:26 -04:00
Michael Youngstrom
e79ffb3b39 Merge pull request #18831 from edx/youngstrom/celery-enrollment-task-tests 
Switch where we create the mock in test_tasks
 2018-08-24 14:37:50 -04:00
Michael Youngstrom
29c312854d Remove test acceptance.tests.lms.test_lms.LoginFromCombinedPageTest.test_login_failure 2018-08-24 14:34:08 -04:00
Michael Youngstrom
b343b2dcb2 Remove acceptance.tests.lms.test_account_settings.AccountSettingsPageTest.test_preferred_language_field 2018-08-24 14:32:27 -04:00
Michael Youngstrom
eadf3650a7 Switch where we create the mock 2018-08-24 12:53:54 -04:00
Diana Huang
0cd312b4d2 Merge pull request #18827 from edx/diana/update-cache-programs 
Switch to using Pathways instead of CreditPathways.
 2018-08-24 11:48:58 -04:00
Diana Huang
18403d2382 Switch to using Pathways instead of CreditPathways. 2018-08-23 15:15:50 -04:00
Albert St. Aubin
8c26b4eefb Update the geoIP.dat files for more accurate identification of Country 
by IP

[LEARNER-6174]

Our .dat files for GeoIP identification should be updated more
frequently or we run the risk of incorrectly identifying Users
locations.
 2018-08-23 14:22:54 -04:00
Stu Young
9ffced6c30 Merge pull request #18811 from edx/testeng/bokchoy_auto_cache_update_446ca1f49b46ee2aa82263fd6a190181702d6c6e 
Bokchoy db cache update
 2018-08-21 16:34:26 -04:00
Jeremy Bowman
3ff3eee2f2 TE-2689 Remove useless pylint suppressions part 4 2018-08-20 12:54:22 -04:00
edx-cache-uploader-bot
f7d4bea21b Updating migrations 2018-08-20 12:38:55 -04:00