Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

19803 Commits

Author SHA1 Message Date
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
Douglas Hall
ffb01bb05e Merge pull request #17223 from edx/douglashall/ENT-851 
ENT-851 TPA Registry.get should return None if passed None.
 2018-01-18 04:54:29 -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
Jae Bradley
5a13f4c7e1 Merge pull request #17191 from edx/learner-3600-upsell-modal 
LEARNER-3584 - Implement Upsell Modal for Learner Analytics Test
 2018-01-17 14:45:41 -05:00
Douglas Hall
f0341e5d29 ENT-851 TPA Registry.get should return None if passed None. 2018-01-17 13:55:56 -05:00
jaebradley
3218f64326 implement upsell modal 
update css

updated css

make modal experimental

add waffle flag
 2018-01-17 11:26:57 -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
Jeremy Bowman
dba976fc16 Merge pull request #17180 from edx/jmbowman/PLAT-1885 
PLAT-1885 Stop using deprecated BlockUsageLocator properties
 2018-01-12 18:02:29 -05:00
Jeremy Bowman
113e8dde61 PLAT-1885 Stop using deprecated BlockUsageLocator properties 2018-01-12 16:40:21 -05:00
Tyler Hallada
7b40f86638 Merge pull request #17185 from edx/thallada/babel-polyfill 
Add babel-polyfill to fix IE11 bug
 2018-01-12 16:37:49 -05:00
Tyler Hallada
9ec5f4d09d Add babel-polyfill to fix IE11 bug 
ReactRenderer used Object.assign which is an ES 2015 feature that is not
supported by IE11. babel-polyfill will now polyfills that function for browsers
that do not support it before ReactRenderer tries to use it.
 2018-01-12 15:32:10 -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
Michael Youngstrom
fb387c9633 Revert "jaebradley/learner 3600 upsell modal" 2018-01-12 14:48:00 -05:00
Jae Bradley
725d354463 Merge pull request #17128 from edx/jaebradley/LEARNER-3600-Upsell-Modal 
jaebradley/learner 3600 upsell modal
 2018-01-12 09:57:09 -05:00
jaebradley
4573b63018 implement modal and carousel 
wip

upsell modal css

remove unnecessary newline

accidentally removed feature

update props

update modal component

update css

add additional slides

update styling

update copy
 2018-01-12 01:35:15 -05:00
Jeremy Bowman
c24d8c1b28 Merge pull request #17167 from edx/jmbowman/PLAT-1884 
PLAT-1884 Replace deprecated xblock.fragment usage
 2018-01-11 16:25:13 -05:00
Nimisha Asthagiri
bb738571ce Merge pull request #17093 from edx/arch/django-app-plugin 
Django App Plugins
 2018-01-11 15:49:45 -05:00
Jeremy Bowman
f8e5e38cc4 PLAT-1884 Replace deprecated xblock.fragment usage 2018-01-11 14:20:12 -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
Michael Terry
57ba9b2ac6 Remove deprecated enabled field 
The CertificateGenerationCourseSetting.enabled column is
deprecated. It is no longer referenced anywhere in the code, and
it's time to remove it.

Original code by Michael LoTurco.

LEARNER-2549
 2018-01-09 10:04:26 -05:00
Qubad786
090e5dc534 Transcript upload backend for Video Upload Page – EDUCATOR-1854 2018-01-09 17:03:44 +05:00
Nimisha Asthagiri
a37d09aefb Move PluginManager out of api folder 2018-01-08 19:15:23 -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
Ammar Naqvi
fde830b73a Updated subsections grade percentage to start rounding 
Changed subsection gating on course outline to consider rounded off grade instead of absolute grade to decide whether to show a subsection which has a prerequisite or not.
EDUCATOR-1676
 2018-01-08 15:29:42 +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
John Eskew
63e885be55 Test fixes for student Django app for v1.9 2018-01-05 14:23:22 -05:00
John Eskew
1504c098a9 Form expected test redirect urls properly. 2018-01-05 14:23:22 -05:00
asadiqbal
e536811640 remove backend_name 2018-01-05 17:32:33 +05:00
Douglas Hall
9071117ea2 Revert "Revert "ENT-779 Remove ProviderConfig.drop_existing_session field from DB."" 
This reverts commit 23e17b3c35.
 2018-01-04 16:57:52 -05:00
Albert (AJ) St. Aubin
e149182aeb Merge pull request #17095 from edx/revert-16934-aj/LEARNER-3629_refund_api_refactor 
Revert "Refactor of the CourseEntitlement Refund API to handle refund failures"
 2018-01-04 14:32:16 -05:00
Albert (AJ) St. Aubin
e53013ec70 Revert "Refactor of the CourseEntitlement Refund API to handle refund failures" 2018-01-04 14:28:12 -05:00
Douglas Hall
23e17b3c35 Revert "ENT-779 Remove ProviderConfig.drop_existing_session field from DB." 2018-01-04 13:20:22 -05:00