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

15584 Commits

Author SHA1 Message Date
Jeremy Bowman
938c9670cc Merge pull request #17376 from edx/jmbowman/PLAT-1915 
PLAT-1915 Stop using deprecated BaseException.message
 2018-02-01 10:24:06 -05:00
Feanil Patel
7dd16638bd Merge pull request #17358 from edx/feanil/flaky_html5_test 
Remove a flaky html5 video test.
 2018-02-01 09:41:23 -05:00
Jeremy Bowman
5289c7e828 PLAT-1915 Stop using deprecated BaseException.message 2018-01-31 17:22:01 -05:00
Douglas Hall
71bd63e361 Merge pull request #17354 from edx/douglashall/ENT-854_part3 
Add migration for removing old edx-enterprise password fields from the database.
 2018-01-31 10:21:46 -05:00
Albert (AJ) St. Aubin
55c6387db6 Merge pull request #17349 from edx/aj/LEARNER-3800 
Aj/learner 3800
 2018-01-31 07:03:34 -05:00
Feanil Patel
6c70147e86 Remove a flaky html5 video test. 2018-01-30 15:13:19 -05:00
Calen Pennington
f2c3aed8e7 Merge pull request #17316 from cpennington/switch-cms-login-to-webpack 
Migrate login.js to webpack
 2018-01-30 14:24:08 -05:00
Douglas Hall
1410209a11 Add migration for removing old edx-enterprise password fields from the database. 2018-01-30 13:43:10 -05:00
Brittney Exline
73f3a63ea2 Merge pull request #17276 from edx/bexline/configure_saml_certs 
ENT-839 Add ability to configure SP metadata for an IdP
 2018-01-30 11:18:09 -07:00
Brittney Exline
c4670a33d7 ENT-839 Add ability to configure SP metadata for an IdP 2018-01-30 11:37:46 -05:00
Calen Pennington
b701ad77c8 Rename require_page to invoke_page_bundle 2018-01-30 10:32:31 -05:00
Calen Pennington
5772042199 Migrate login.js to webpack 2018-01-30 10:32:31 -05:00
edx-cache-uploader-bot
6284a48cd7 Updating migrations 2018-01-30 10:23:40 -05:00
Albert St. Aubin
ddab8123c1 Updates to the Course Entitlement API to block Learners from enrolling 
in runs that are not available.

[LEARNER-3800]
 2018-01-30 09:52:06 -05:00
Albert (AJ) St. Aubin
01553ff1bc Revert "Aj/learner 3800" 2018-01-30 09:45:05 -05:00
Asad Iqbal
6fbd8f2453 Merge pull request #17279 from edx/asadiqbal08/ENT-398 
Delete SAML Provider Configurations (Soft Delete)
 2018-01-30 18:17:03 +05:00
Albert (AJ) St. Aubin
b41019f304 Merge pull request #17308 from edx/aj/LEARNER-3800 
Aj/learner 3800
 2018-01-30 07:42:05 -05:00
Sofiya Semenova
72d300b822 Merge pull request #17290 from edx/sofiya/ed-2149 
Test that video completion data is only being sent after a video has been watched, and not on page load
 2018-01-29 17:24:53 -05:00
Douglas Hall
3e3b5dda3e Merge pull request #17340 from edx/douglashall/ENT-854_part2 
ENT-854 Remove references to old EnterpriseCustomerReportingConfiguration model fields.
 2018-01-29 16:43:05 -05:00
Sofiya Semenova
078ed719a0 Test that video is only completed upon being watched 2018-01-29 15:52:22 -05:00
Douglas Hall
538b073ee4 ENT-854 Remove references to old EnterpriseCustomerReportingConfiguration model fields. 2018-01-29 15:43:28 -05:00
David Ormsbee
b0f67c975d Merge pull request #16322 from mitodl/capa_show_answer_fix 
Fix for courses which have url_names with colons, e.g. problem:question1
 2018-01-29 15:07:16 -05:00
Troy Sankey
381af53ad5 Merge pull request #17130 from edx/jeskew/fix_lms_shard_4_tests_django_111 
LMS shard 4 tests Django 1.11
 2018-01-29 14:14:22 -05:00
Albert St. Aubin
90d29550bb test fix 2018-01-29 13:06:17 -05:00
Amir Qayyum Khan
3bda024a66 Fixed for courses which have url_names with colons, e.g. problem:question1 
What's this PR do?
It fixes display.js to escape colons in element ID's so they can be selected with jquery,
Previously jquery was throwing errors about unsupported pseudos, e.g.:

unrecognized expression: unsupported pseudo: pset1_1_2_1
How should this be manually tested?
create a course with column (:) in its problem id, and see console for any issue

Added tests
 2018-01-29 22:38:04 +05:00
Albert St. Aubin
12e77b27e4 PR updates 2018-01-29 12:22:56 -05:00
Albert St. Aubin
3876a823f8 pr 2018-01-29 11:15:33 -05:00
edx-cache-uploader-bot
8b420c1221 Updating migrations 2018-01-29 10:56:36 -05:00
Albert St. Aubin
1bd4bde9a4 PR and quality updates 2018-01-29 09:07:29 -05:00
Qubad786
287f4836af update val version and clean external video export tests 2018-01-29 19:05:55 +05:00
John Eskew
fa7bb1ea81 Merge pull request #17311 from mitodl/python_lib_import_fix_v2 
Enabled python code lib import with GIT_IMPORT_STATIC set to False
 2018-01-26 14:41:12 -05:00
Jesse Zoldak
2f9a0cad60 Merge pull request #17313 from edx/testeng/bokchoy_auto_cache_update_47a2eb9be1caf40fbe0262b0cca3ae0990fa1ddd 
Bokchoy db cache update
 2018-01-26 12:48:37 -05:00
edx-cache-uploader-bot
2b90998715 Updating migrations 2018-01-26 09:55:51 -05:00
asadiqbal
47547c0c1b Delete SAML Provider Configurations 2018-01-26 17:54:45 +05:00
Qubad786
64555c60c0 Move request_cache to openedx.core.djangoapps 2018-01-26 15:09:25 +05:00
Gavin Sidebottom
382b6069d8 PR feedback (added docstring notes, cleared up log messages) 2018-01-25 16:09:13 -05:00
Gavin Sidebottom
ec0263bc5b changed 'course code lib' references to 'python lib' to maintain consistency 2018-01-25 16:08:57 -05:00
Gavin Sidebottom
8476f19463 Enabled python code lib import with GIT_IMPORT_STATIC set to False 2018-01-25 16:08:25 -05:00
Albert St. Aubin
cac22680e2 Updates to the Course Entitlement API to block Learners from enrolling 
in runs that are not available.

[LEARNER-3800]
 2018-01-25 14:53:03 -05:00
John Eskew
27edca3c5e Replace all clean_course_id form methods with common method. 2018-01-25 11:38:46 -05:00
John Eskew
b1f0b7d230 Convert course id to locator differently to accomodate Django 1.11 2018-01-25 11:33:52 -05:00
Troy Sankey
6d061a16c5 Enable cache isolation for test_email tests 
Cache isolation is provided by
CacheIsolationMixin/CacheIsolationTestCase, and was enabled in these
tests in order to stop the 'site' variable in the edxmako template
context from bleeding into subsequent tests via the request cache.
 2018-01-25 11:33:51 -05:00
Albert (AJ) St. Aubin
f07880bb38 Merge pull request #17297 from edx/aj/LEARNER-3629_refactor 
Refactor of the CourseEntitlement Refund API to handle refund failures
 2018-01-25 07:13:44 -05:00
sanfordstudent
fda773721c Merge pull request #17285 from edx/sstudent/hide_cert_setting 
deprecate html setting for web certs and set to true by default
 2018-01-24 16:27:40 -05:00
Sanford Student
e2becea8cb deprecate html setting for web certs and set to true by default 2018-01-24 15:02:44 -05:00
Albert St. Aubin
f0436aa832 Refactor of the CourseEntitlement Refund API to handle refund failures 
[LEARNER-3629]

The CourseEntitlement Refund API will not respond with ERROR codes when
the attempted refund call to Ecommerce fails.
 2018-01-24 14:46:58 -05:00
Brian Mesick
bffd906909 Merge pull request #17115 from edx/bmedx/django111_cms_test_failures 
Fixes to CMS failures in Django 1.11 tests
 2018-01-24 14:46:52 -05:00
Jeremy Bowman
ebc54c8f1a PLAT-1890 Fixed assorted ModifyingEnforceTypeWarning warnings 2018-01-24 11:49:42 -05:00
bmedx
1d45c85135 Refactor student login for readability and fix Django 1.11 issues 2018-01-24 11:26:43 -05:00
Calen Pennington
69348d06d7 Merge pull request #17009 from cpennington/cms-login-factory-page 
Convert cms login.html to the require_page pattern in preparation for…
 2018-01-24 10:19:27 -05:00