Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,447 Commits 1 Branch 0 Tags
8fa3bf327f2ea733592939636a5524f41205d69b
Commit Graph

37447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
8fa3bf327f Merge pull request #12651 from edx/clintonb/single-logout 
Added support for OpenID Connect single logout
 2016-06-15 12:56:50 -04:00
Clinton Blackburn
3f19cc0265 Updated logout view 
In addition to logging the user out of LMS, the logout view also logs users out of the IDAs to which they previously authenticated.

ECOM-4610
 2016-06-15 11:11:49 -04:00
Ahsan Ulhaq
09cdc6f47f Merge pull request #12760 from edx/ahsan/ECOM-4217-certs-invalidate-by-instructor 
Revert "Revert Adding logic to check if cert is invalidate then user cannot see the cert"
 2016-06-15 19:48:18 +05:00
Douglas Hall
7040a741b1 Merge pull request #12758 from edx/douglashall/HULL-22 
HULL-22 Get platform name via microsite configuration for forgot password page
 2016-06-15 10:19:16 -04:00
Awais
0bd1f4ccdd Adding logic to check if cert is invalidate then user cannot see the regen button. 
ECOM-4217
 2016-06-15 19:02:06 +05:00
Ben Patterson
6eb9b65497 Merge pull request #12761 from edx/tasawer/bugfix/ecom-4713-mark-test-as-flaky 
Test marked as flaky
 2016-06-15 09:17:14 -04:00
Toby Lawrence
9abce102ff Merge pull request #12573 from edx/PERF-325 
[PERF-325] Add versioned course asset URLs when canonicalizing asset paths.
 2016-06-15 09:05:13 -04:00
Toby Lawrence
849ebc5f22 [PERF-325] Add versioned course asset URLs when canonicalizing asset paths. 2016-06-15 08:04:52 -04:00
Awais Jibran
acc3a9bf76 Merge pull request #12713 from edx/aj/ecom4650-fix-remove-exception 
Fix remove user from cert-exception list
 2016-06-15 17:00:55 +05:00
Tasawer
9281c601c0 test marked as flaky 2016-06-15 16:34:48 +05:00
Tasawer Nawaz
2336c584d7 Merge pull request #12714 from edx/tasawer/bugfix/ecom-1730-fix-integrity-error-in-student-enrollment 
Fixed IntegrityError when making parallel enrollment requests for the same user / course
 2016-06-15 16:49:21 +08:00
Tasawer
eb3517c27e Fixing IntegrityError happened on concurrent requests for course enrollment 
ECOM-1730
 2016-06-15 12:14:03 +05:00
Douglas Hall
a36ede4e25 Get platform name via microsite configuration for forgot password page 2016-06-14 22:50:05 -04:00
Douglas Hall
c7e6de0dbc Merge pull request #12755 from edx/douglashall/HULL-22 
HULL-22 Get platform name via microsite configuration for forgot password page
 2016-06-14 18:54:48 -04:00
Douglas Hall
036faf9b41 Get platform name via microsite configuration for forgot password page 2016-06-14 16:39:26 -04:00
Chris
142eb42e6b Merge pull request #12745 from edx/clrux/ac-472 
AC-472 removing outline from main
 2016-06-14 15:49:15 -04:00
Adam
147bb014b9 Merge pull request #12746 from edx/adam/fix-error-message 
make error message more readable
 2016-06-14 15:36:52 -04:00
Adam Palay
44636fe62d fix variable ordering issue with error message 2016-06-14 14:39:07 -04:00
Chris Rodriguez
fbcf334a67 AC-472 removing outline from main 2016-06-14 14:29:00 -04:00
Ben Patterson
b8fbab67d4 Merge pull request #12725 from edx/benp/ac-488 
Pin the specific version number so the github install knows when to run.
 2016-06-14 14:08:52 -04:00
Ben Patterson
f5a6afdd9a Merge pull request #12748 from edx/revert-12666-awais786/ECOM-4217-certs-invalidate-by-instructor 
Revert "Adding logic to check if cert is invalidate then user cannot see the …"
 2016-06-14 13:48:17 -04:00
Jesse Zoldak
56e6f04cc7 Merge pull request #12736 from edx/zoldak/fix-docstring 
Fix a docstring to reflect what the method actually does
 2016-06-14 12:49:04 -04:00
Brian Jacobel
52450e9828 Merge pull request #12731 from edx/bjacobel/requirejs-sync 
Fixes to #12266
 2016-06-14 12:25:09 -04:00
Ben Patterson
707b682fe0 Revert "Adding logic to check if cert is invalidate then user cannot see the …" 2016-06-14 12:03:17 -04:00
Chris
ff242a3eac Merge pull request #12694 from edx/clrux/ac-454-repeat 
AC-454 visual indicator in video menus + safe transcripts
 2016-06-14 08:46:47 -04:00
Chris Rodriguez
55d84d34b8 AC-454 adding visual clarify for selected menu options 2016-06-14 07:53:15 -04:00
Ehtesham Kafeel
f4e6cbba9e Merge pull request #12710 from edx/ekafeel/clean-karma-log 
Make karma logs cleaner
 2016-06-14 14:10:55 +05:00
Awais Qureshi
a361d44bfd Merge pull request #12666 from edx/awais786/ECOM-4217-certs-invalidate-by-instructor 
Adding logic to check if cert is invalidate then user cannot see the …
 2016-06-14 13:50:17 +05:00
Ehtesham
f83efed9f6 making karma logs cleaner by limiting stack trace and browser log 2016-06-14 11:59:30 +05:00
Clinton Blackburn
77f605b30a Corrected usage of the title block for the main_django template 
ECOM-4610
 2016-06-13 19:11:36 -04:00
Ben Patterson
6bc0fa2bd3 Merge pull request #12737 from edx/benp/disabled-parallel 
Disable parallelization for lms unit tests.
 2016-06-13 16:25:46 -04:00
Simon Chen
8d672bc832 ECOM-3206 allow run selection and enrollment (#12685) 2016-06-13 15:08:00 -04:00
Ben Patterson
6ccf7cf6fb Disable parallelization for lms unit tests. 2016-06-13 15:05:51 -04:00
Jesse Zoldak
864130c6e4 Fix a docstring to reflect what the method actually does 2016-06-13 14:42:15 -04:00
Brian Jacobel
781a20497b Merge pull request #12735 from edx/bjacobel/dsc-image-overflow 
Fix overflowing images in forum posts/responses
 2016-06-13 14:25:42 -04:00
Cliff Dyer
2337b80af5 Merge pull request #12722 from edx/tnl/splittest-zerogroup-test 
modified tests to directly address split test group 0 issues.
 2016-06-13 13:26:29 -04:00
Brian Jacobel
5e0e337654 Fix overflowing images in forum posts/responses 2016-06-13 12:30:13 -04:00
Robert Raposa
9eaa1acdea Merge pull request #12730 from edx/robrap/linter-thresholds 
Reduce linter thresholds.
 2016-06-13 12:24:24 -04:00
Brian Jacobel
17a19d2180 Can't reference a %def from another %def 2016-06-13 11:21:42 -04:00
Awais Jibran
8d40dcd0f4 Fix remove user from cert-exception list 
ECOM-4650
 2016-06-13 18:50:16 +05:00
Awais Jibran
1e67ec66cd Merge pull request #12702 from edx/aj/PLAT-1032-fix-export 
Fix course export on edge
 2016-06-13 18:46:56 +05:00
Awais Jibran
fc885cbcea Merge pull request #12662 from edx/aj/fix-email-opt-in-list 
Fix email opt in list managemnet command
 2016-06-13 18:46:06 +05:00
Robert Raposa
f7042d748d Reduce linter thresholds. 2016-06-13 09:42:00 -04:00
Sofiya Semenova
0431bacbe1 Merge pull request #12656 from edx/ssemenova/tabindex 
Removing instances of positive integer tab index values
 2016-06-13 09:23:48 -04:00
Asad Iqbal
d52851066a Merge pull request #12690 from edx/asadiqbal08/update-recommender-xblock-version 
WL-507: Update the version of Recommender XBlock
 2016-06-13 17:36:35 +05:00
asadiqbal
d932e09c22 updated the version of recommeder xblock 2016-06-13 16:51:44 +05:00
Asad Iqbal
03a610db4d Merge pull request #12715 from edx/asadiqbal08/update_drag_and_drop_version 
updated the version from 2.0.6 to 2.0.7
 2016-06-13 09:46:25 +05:00
Awais
112aa71fe0 Adding logic to check if cert is invalidate then user cannot see the regen button. 
ECOM-4217
 2016-06-11 15:26:30 +05:00
Ben Patterson
acb3abe571 Pin the specific version number so the github install knows when to run. 2016-06-10 16:19:53 -04:00
Robert Raposa
84726d6e1b Merge pull request #12723 from edx/release 
Merge hotfix-2016-06-10 release into master
 2016-06-10 16:01:23 -04:00