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

37469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Montoya
43ea4e21bb Converting views/tabs.coffee in the cms to js 
Linting the compiled file
 2016-06-16 18:35:34 -07:00
Douglas Hall
7e55cc26d8 Merge pull request #12769 from edx/release 
Merging Patch Release 2016-06-15 back to master
 2016-06-16 11:35:47 -04:00
Muzaffar yousaf
08a4d11db1 Merge pull request #12378 from edx/usman/atomic-refinement 
A more considerate outer_atomic.
 2016-06-16 17:25:54 +05:00
Usman Khalid
781623205e Added a named outer_atomic option. 
A named outer is suitable when dealing with IntegrityErrors. It only
checks that it is not nested under an atomic only if it is nested
under enable_outer_atomic(name=<name>). This way only the view which
is causing IntegrityErrors needs to have its automatic transaction
management disabled and other callers are not effected.
 2016-06-16 14:18:21 +05:00
Waheed Ahmed
70a0b063ed Merge pull request #12759 from edx/waheed/ecom-2378-change-refund-log-level 
Changed refund log level to warning.
 2016-06-16 03:45:07 +05:00
Waheed Ahmed
07ab6cc744 Changed refund log level to warning. 
ECOM-2378
 2016-06-16 02:59:37 +05:00
Chris
b725dc0d75 Merge pull request #12744 from edx/clrux/ac-455 
AC-455 adding main to PDF books; styling chapters
 2016-06-15 17:36:45 -04:00
Douglas Hall
32b8391c11 Merge pull request #12766 from edx/patch/2016-06-15 
Patch Release 2016-06-15
 2016-06-15 16:51:45 -04:00
estute
d5c0e25a19 Merge pull request #12765 from edx/release 
Merge Release to Master
 2016-06-15 15:58:30 -04:00
Calen Pennington
a2bf90f64f Merge pull request #12763 from cpennington/badge-testing-allow-missing-dir 
Don't try and cleanup a directory that doesn't exist (in badging tests)
 2016-06-15 15:57:44 -04:00
Chris Rodriguez
079b2df404 AC-455 adding main to PDF books 2016-06-15 14:05:31 -04:00
Calen Pennington
5e11f86ed7 Remove flaky-test marker from badges tests 2016-06-15 13:49:52 -04:00
Douglas Hall
5e13fb496f Get platform name via microsite configuration for forgot password page 2016-06-15 13:44:31 -04:00
Douglas Hall
64546afb6d Get platform name via microsite configuration for forgot password page 2016-06-15 13:44:08 -04:00
estute
f643f2dc2a Merge pull request #12733 from edx/rc/2016-06-14 
Release Candidate rc/2016-06-14
 2016-06-15 13:21:52 -04:00
Brian Jacobel
38bd9ad047 Merge pull request #12740 from edx/bjacobel/discussions-self-post-interaction 
Can't report or vote for your own posts
 2016-06-15 13:04:33 -04:00
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
Brian Jacobel
b6cf9d231f Disallow reporting and upvoting of your own posts in discussion forums 2016-06-15 12:01:23 -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
Calen Pennington
4840f8c568 Don't try and cleanup a directory that doesn't exist (in badging tests) 2016-06-15 09:51:43 -04: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
estute
dfd5bd3e84 Merge pull request #12742 from edx/ahsan/fix-order-history-page-error 
Fix order history page if order doesn't have any product
 2016-06-14 14:24:45 -04:00
Christina Roberts
68859e7c6a Merge pull request #12747 from edx/christina/fix-delete-icon 
Don't hide spans within ui-btn-non class.
 2016-06-14 14:14:10 -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
Ahsan Ulhaq
39f8757f42 Fix order history page if order don't have any product 2016-06-14 22:34:36 +05:00
cahrens
ffb1ec97bd Don't hide spans within ui-btn-non class. 
TNL-4799
 2016-06-14 13:01:01 -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