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

4096 Commits

Author SHA1 Message Date
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
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
Christopher Lee
3959509696 Merge pull request #17242 from edx/clee/optimizely 
Disable optimizely for xblocks for the mobile app
 2018-01-22 15:36:20 -05:00
Michael Terry
948cae4148 Fix crash using create_user 
Fix an invalid import usage to avoid a crash with the management
command create_user.

LEARNER-3932
 2018-01-22 13:46:35 -05:00
Matthew Piatetsky
e0bdd3773a Merge pull request #17273 from edx/try_bundling_test_fix 
Request correct program for bundling test
 2018-01-22 13:31:07 -05:00
christopher lee
8a00b76f01 Disable optimizely for xblocks for the mobile app 2018-01-22 12:05:57 -05:00
Matthew Piatetsky
472de18f2e Request correct program for bundling test 2018-01-22 09:19:41 -05:00
Nimisha Asthagiri
dd136b457b Merge pull request #17197 from edx/arch/cert-import-signals-cleanup 
Certificates: clean up imports and signals
 2018-01-20 09:32:59 -05:00
Nimisha Asthagiri
2e9efe6472 Fix Certificates import and signals code 2018-01-19 15:12:28 -05:00
Albert (AJ) St. Aubin
00a1205934 Merge pull request #17254 from edx/aj/LEARNER-3672 
Updated the CourseEnrollment Admin form to correctly handle Course
 2018-01-19 14:50:43 -05:00
Albert St. Aubin
3661e1acdf Updated the CourseEnrollment Admin form to correctly handle Course 
[LEARNER-3672]

Updated the CourseEnrollment Admin form to convert the Course Strings to
CourseKey or OpaqueKey values as expected.
 2018-01-19 13:42:18 -05:00
Jeremy Bowman
67f4907ef2 Merge pull request #17243 from edx/jmbowman/PLAT-1889 
PLAT-1889 Fix URL config and reversal issues
 2018-01-19 12:50:16 -05:00
Bill Filler
733c275db0 Merge pull request #17083 from edx/bfiller/gated-content-combined 
Conditionally display gated content in outline and courseware
 2018-01-19 12:41:11 -05:00
Jeremy Bowman
ca84751bbd PLAT-1889 Fix URL config and reversal issues 2018-01-19 11:02:06 -05:00
Matthew Piatetsky
24e4f2fa63 Merge pull request #17244 from edx/try_bundling_test_fix 
Add some more data for debugging bundling test and try potential fix
 2018-01-18 23:52:08 -05:00
Matthew Piatetsky
0065e3c81e Add some more data for debugging bundling test and try potential fix 2018-01-18 18:03:14 -05:00
Jeremy Bowman
bcc8ae6a78 Merge pull request #17187 from edx/jmbowman/PLAT-1831 
PLAT-1831 Install prereqs for tox-based bok-choy and lettuce runs
 2018-01-18 16:31:28 -05:00
Albert (AJ) St. Aubin
dfe149b5ff Merge pull request #17234 from edx/aj/pagination_update_entitlements 
Increased the page size for the entitlements API
 2018-01-18 14:38:23 -05:00
Jeremy Bowman
8513945229 PLAT-1831 Install prereqs for tox-based bok-choy and lettuce runs 2018-01-18 13:44:34 -05:00
Bill Filler
4fe5f3457d Conditionally display gated content in courseware 
Display gated sections in course outline, navigation and in the course
when user has met prerequiste condition.

WL-1273, WL-1317
 2018-01-18 12:34:19 -05:00
Albert St. Aubin
e23def673b Increased the page size for the entitlements API 2018-01-18 10:19:55 -05:00
Calen Pennington
bacd4334ed Add a form of static:require_module that assumes that the factory is self-initializing 2018-01-18 10:10:30 -05:00
Saleem Latif
7858066776 Merge pull request #17230 from edx/saleem-latif/ENT-805-add-logging 
[ENT-805]: Add logging to better understanding why skip activation email is not working as expected.
 2018-01-18 19:41:36 +05:00
Saleem Latif
06b6c1c50d Add logging to better understanding why skip activation email is not working as expected. 2018-01-18 14:22:53 +05:00
Douglas Hall
f0341e5d29 ENT-851 TPA Registry.get should return None if passed None. 2018-01-17 13:55:56 -05:00
Jeff LaJoie
ed1d33e547 LEARNER-3661: Removes sessions a user has already claimed an entitlement for from list of available sessions 2018-01-17 09:40:04 -05:00
Jeremy Bowman
7e2a231098 Merge pull request #16957 from edx/jmbowman/PLAT-1858 
PLAT-1858 Better capture of deprecation warnings
 2018-01-16 10:58:29 -05:00
Albert (AJ) St. Aubin
5553e7ddf1 Merge pull request #17172 from edx/aj/LEARNER-3708 
Changes the Program Details page to show the most recently purchased
 2018-01-16 08:28:37 -05:00
Jeremy Bowman
7d436a18ee PLAT-1858 Better capture of deprecation warnings 2018-01-12 18:04:32 -05:00
Albert St. Aubin
2e99ee0d7f Changes the Program Details page to show the most recently purchased 
entitlement data

[LEARNER-3708]
 2018-01-12 15:03:25 -05:00
Brittney Exline
c1d4458b83 ENT-838 Management command to change an enterprise user's username 2018-01-11 11:30:24 -05:00
Jeremy Bowman
64b06b2259 Merge pull request #17155 from edx/jmbowman/PLAT-1881 
PLAT-1881 Fix datetimes lacking timezone information
 2018-01-10 18:00:10 -05:00
John Eskew
add3a21dc7 Merge pull request #17112 from edx/jeskew/fix_static_asset_pipeline_tests_django1.9 
Fix static asset pipeline tests in Django 1.9.
 2018-01-10 17:35:09 -05:00
John Eskew
cbf836227b Disable migration-checking test in Django 1.9+ 2018-01-10 15:50:39 -05:00
John Eskew
6174e4deb6 Ensure npm install before static asset pipeline tests. 2018-01-10 15:50:39 -05:00
Jeremy Bowman
1a7753d775 PLAT-1881 Fix datetimes lacking timezone information 2018-01-10 14:33:01 -05:00
Jeremy Bowman
4026c25f7a Merge pull request #17133 from edx/jmbowman/PLAT-1873_2 
PLAT-1873 to_deprecated_string() cleanup part 2
 2018-01-10 13:45:15 -05:00
Harry Rein
042a854bd0 Merge pull request #17124 from edx/HarryRein/dashboard-entitlement-with-no-course-runs 
Show more sessions coming soon on course dashboard.
 2018-01-09 14:13:33 -05:00
Harry Rein
b404173046 Show more sessions coming soon on course dashboard. 
LEARNER-3808

Ensures that users can see their entitlement purchase whether there
are available sessions or not. Notifies them with a message stating that
more sessions are coming soon, as is currently implemented on the programs
dashboard.
 2018-01-09 13:04:36 -05:00
Jeremy Bowman
669aa13ad6 PLAT-1873 to_deprecated_string() cleanup part 2 2018-01-08 17:26:55 -05:00
Jeremy Bowman
d3d6272d8f PLAT-1873 to_deprecated_string() cleanup part 1 2018-01-08 13:51:42 -05:00
Douglas Hall
9976771628 Merge pull request #17099 from edx/douglashall/ENT-779_migration_2 
Revert "Revert "ENT-779 Remove ProviderConfig.drop_existing_session f…
 2018-01-08 11:00:08 -05:00
Asad Iqbal
3daea9bae3 Merge pull request #17090 from edx/asadiqbal08/ENT-478-new 
[ENT-478]:asadiqbal08/ SAML Provider Configs List View Updates
 2018-01-08 12:55:01 +05:00
John Eskew
b4552a60f3 Merge pull request #17048 from edx/jeskew/lms_shard_4_fixes_django_19 
Fix LMS shard 4 test failures under Django 1.9.
 2018-01-05 15:59:54 -05:00
Michael Terry
b7fbfc938d Fix expire_old_entitlements celery task 
Celery was not able to find the task implementation, because we were
putting it in a nonstandard place.
 2018-01-05 14:34:10 -05:00