Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
Tyler Hallada
73cffad5ce Dev in sfe container & prod use /dist of sfe 2018-02-15 13:20:18 -05:00
John Hensley
c7c01e4a22 Fix user creation management commands 
Two user creation scripts were broken by the move of
student.views._do_create_account to student.helpers.do_create_account.

This patch just catches the scripts up.
 2018-02-14 11:32:26 -05:00
Michael Frey
ed54cdc1d9 increase limit for staff users 2018-02-13 12:49:26 -05:00
Michael Roytman
7fc5a78528 Merge pull request #17457 from edx/mroytman/EDUCATOR-1613-i18n 
pass language to mako template
 2018-02-13 09:58:00 -05:00
Michael Roytman
3496bb9a0a pass language to mako template 2018-02-12 15:44:20 -05:00
Michael LoTurco
82f4ce4252 Add CourseEntitlementSupportDetail model and related admin model 
Learner-3919
 2018-02-12 11:43:44 -05:00
Matthew Piatetsky
bb8f9ae915 Merge pull request #17431 from edx/bundling_test_handle_exceptions 
handle exceptions and create the necessary html in optimizely
 2018-02-09 08:59:40 -05:00
Ahsan Ulhaq
25130ae3c8 Making honor code not eligible for Certificate 
LEARNER-4117
 2018-02-09 13:53:50 +05:00
Matthew Piatetsky
618146e415 addressing comments 2018-02-08 11:29:56 -05:00
Matthew Piatetsky
826ef28b4d handle exceptions and create the necessary html in optimizely 2018-02-08 10:25:52 -05:00
Brian Mesick
86d077ac3d Merge pull request #17413 from edx/bmedx/upgrade_nltk 
Upgrade NLTK to 3.2.5, fixup usage and tests
 2018-02-07 15:39:22 -05:00
bmedx
6a22de454f Upgrade NLTK to 3.2.5, fixup usage and tests 2018-02-07 10:42:23 -05:00
Jeremy Bowman
378287fbc0 Merge pull request #17404 from edx/jmbowman/PLAT-1942 
PLAT-1942 Handle xmodule_django field deprecations
 2018-02-06 13:23:04 -05:00
Jeremy Bowman
9682e00f4c PLAT-1943 Fix more naive datetime warnings 2018-02-05 17:58:35 -05:00
Jeremy Bowman
bf86b3da98 PLAT-1942 Handle xmodule_django field deprecations 2018-02-05 15:05:54 -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
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
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
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
Douglas Hall
538b073ee4 ENT-854 Remove references to old EnterpriseCustomerReportingConfiguration model fields. 2018-01-29 15:43:28 -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
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
Albert St. Aubin
1bd4bde9a4 PR and quality updates 2018-01-29 09:07:29 -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
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
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
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
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
bmedx
46cb89e55d Fixes to CMS failures in Django 1.11 tests 2018-01-23 14:11:06 -05:00