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

15524 Commits

Author SHA1 Message Date
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
Sofiya Semenova
b3294bdea1 Merge pull request #17240 from edx/sofiya/ed-2140 
Video completion recording does not happen at the end of the video
 2018-01-22 11:38:00 -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
Jesse Zoldak
459bf63ee0 Merge pull request #17239 from edx/testeng/bokchoy_auto_cache_update_88834860015445be6b1c5d3affbd5afca7e1b59a 
Bokchoy db cache update
 2018-01-19 14:43:12 -05:00
Sofiya Semenova
380273bcaa Video completion marked at end of video 2018-01-19 14:39:49 -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
edx-cache-uploader-bot
f9ac6f1e2f Updating migrations 2018-01-19 11:39:24 -05:00
Sanford Student
af0909e8cf reducing logging for EDUCATOR-1290 2018-01-19 11:34:44 -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
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