Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
ee3f792eed Merge pull request #17171 from edx/zoldak/remove-skipped-test-with-pylint-errors 
Remove skipped testcases
 2018-01-12 15:52:11 -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
3b5fb67740 Remove accidental commit 2018-01-12 14:52:08 -05:00
Michael Youngstrom
fb387c9633 Revert "jaebradley/learner 3600 upsell modal" 2018-01-12 14:48:00 -05:00
Michael Youngstrom
0d76e40e00 dummy test 2018-01-12 14:47:38 -05:00
Robert Raposa
3afa83c0c4 Merge pull request #15598 from edx/andya/developer-doc-cleanups 
Improve documentation for the Open edX features
 2018-01-12 13:40:08 -05:00
Tyler Hallada
7a6db19a18 Merge pull request #17159 from edx/thallada/fix-discussion-off-screen-bug 
Use percentage widths to fix flex-box bug
 2018-01-12 13:33:37 -05:00
Andy Armstrong
7c09ebb794 Improve documentation for the Open edX features 2018-01-12 10:52:07 -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
Zubair Afzal
6603717a42 Merge pull request #17175 from edx/zub/ENT-678-fix-enterprise-logo-stretching 
ENT-678 Fix enterprise logo stretching in enterprise sidebar
 2018-01-12 17:44:06 +05:00
Mushtaq Ali
cc83e7861e Merge pull request #17122 from edx/mrehan/delete-transcripts 
Delete transcript
 2018-01-12 16:30:31 +05:00
zubair-arbi
72068213e1 ENT-678 Fix enterprise logo stretching in enterprise sidebar 2018-01-12 15:55:28 +05:00
Mushtaq Ali
6af1215bcd Add delete js tests 2018-01-12 15:25:00 +05:00
Ahsan Ulhaq
3492eecd34 Added field description for accessibility 
In account settings page when language changes the page is refreshed
to apply changes. But user is not advised about this change before using
the field. So added description so user knows about reload beforehand.
LEARNER-3832
 2018-01-12 14:09:13 +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
Harry Rein
f747493c33 Merge pull request #17168 from edx/HarryRein/LEARNER-3734-chronological-session-selection 
Sort available sessions by start date.
 2018-01-11 15:34:14 -05:00
Brittney Exline
2fab772ea4 Merge pull request #17150 from edx/bexline/fix_enterprise_usernames 
ENT-838 Management command to change an enterprise user's username
 2018-01-11 12:54:53 -07:00
Jesse Zoldak
dae4ece3ab Remove skipped testcases 2018-01-11 14:54:42 -05:00
Nimisha Asthagiri
c5afde2d76 Quiet quality 2018-01-11 14:35:08 -05:00
Nimisha Asthagiri
306ec1f9f0 Update theming app to be a Django App Plugin 2018-01-11 14:35:08 -05:00
Nimisha Asthagiri
93c6a89bd6 Update schedules app to be a Django App Plugin 2018-01-11 14:35:08 -05:00
Nimisha Asthagiri
4c67302604 Update grades app to be a Django App Plugin 2018-01-11 14:35:07 -05:00
Nimisha Asthagiri
f16bfac88b Update ace_common app to be a Django App Plugin 2018-01-11 14:35:07 -05:00
Nimisha Asthagiri
70164ff978 Update setup.py with few Django App Plugins 2018-01-11 14:35:07 -05:00
Nimisha Asthagiri
7490cd93ab Enable Django App Plugins in LMS 2018-01-11 14:35:07 -05:00
Nimisha Asthagiri
24d6c314ef Enable Django App Plugins in CMS 2018-01-11 14:35:06 -05:00
Nimisha Asthagiri
c2fc546db9 Support for Django App Plugins 2018-01-11 14:35:06 -05:00
Nimisha Asthagiri
11794c8384 Rename schedules/docs/img to schedules/docs/images 2018-01-11 14:35:05 -05:00
Nimisha Asthagiri
dc3510a619 README docs for lms/envs directory 2018-01-11 14:35:05 -05:00
Jeremy Bowman
f8e5e38cc4 PLAT-1884 Replace deprecated xblock.fragment usage 2018-01-11 14:20:12 -05:00
Ned Batchelder
58d23e4159 Merge pull request #17166 from mreyk/teltek/feature/allow-cert-name-aws-override 
Allow to override CERT_NAME_SHORT and CERT_NAME_LONG default values
 2018-01-11 13:19:14 -05:00
Harry Rein
287a00ee77 Sort available sessions by start date. 
LEARNER-3734
 2018-01-11 12:34:46 -05:00
Matt Tuchfarber
78bc871fa4 Merge pull request #17091 from open-craft/clemente/upstream-add-blocks-to-course-about 
Add some blocks to course_about.html
 2018-01-11 12:21:22 -05:00
Stu Young
00db38188d Merge pull request #17107 from edx/estute/enable-bokchoy-db-caching-on-jenkins 
use db cache in jenkins bok choy builds
 2018-01-11 12:03:44 -05:00
Brittney Exline
c1d4458b83 ENT-838 Management command to change an enterprise user's username 2018-01-11 11:30:24 -05:00
Ari Rizzitano
22a4f46e13 Merge pull request #17158 from edx/ari/package-lock 
check in package-lock.json [FEDX-399]
 2018-01-11 10:41:34 -05:00
mrey
a28f3046e1 Allow to override CERT_NAME_SHORT and CERT_NAME_LONG default values 2018-01-11 16:37:30 +01:00
Afzal Wali
134a04ca58 WL-1289 
Made the certificates section on the user profile page site aware. Only the certificates earned that the user earned on that site will be visible.
 2018-01-11 18:32:07 +05:00
Qubad786
55001ca81a Transcript delete on Video Upload Page - EDUCATOR-1961 2018-01-11 13:08:07 +05:00
Mushtaq Ali
9dcedaf82b Merge pull request #17138 from edx/mushtaq/improve-transcript-sorting 
Sort transcript languages
 2018-01-11 12:57:00 +05:00
Waheed Ahmed
69cd383402 Merge pull request #17145 from edx/waheed/LEARNER-3754-update-my-program-detail-url-for-mobile 
Update program detail fragment url for mobile apps.
 2018-01-11 12:42:23 +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
Tyler Hallada
804eacdb04 Use percentage widths to fix flex-box bug 2018-01-10 17:48:34 -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
Ari Rizzitano
4a03d45d7d check in package-lock.json [FEDX-399] 2018-01-10 17:33:26 -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