Commits · 3f2cd706e8694f0ef6a4cb0dee45f1a76d53ff55 · edx / edx-platform

23 Mar, 2015 1 commit
- Merge pull request #7437 from edx/will/ecom-1229 · 3f2cd706
```
Course info page no longer creates enrollments.
```
  Will Daly committed Mar 23, 2015
  3f2cd706 Browse Files
21 Mar, 2015 4 commits
- Merge pull request #7440 from edx/nimisha/fix-account-creation-merge-issue · ec6cc04b
```
Fixes merge conflict with account creation transaction.
```
  Nimisha Asthagiri committed Mar 21, 2015
  ec6cc04b Browse Files
- Fixes merge conflict with account creation transaction. · dd8aba8f
  Nimisha Asthagiri committed Mar 21, 2015
  
  dd8aba8f Browse Files
- Merge pull request #7420 from open-craft/fix-library-analytics · c35cd5d8
```
Fix two content library analytics issues (SOL-521)
```
  Braden MacDonald committed Mar 20, 2015
  c35cd5d8 Browse Files
- Fix two content library analytics issues (SOL-521) · 7764f364
  Braden MacDonald committed Mar 20, 2015
  
  7764f364 Browse Files
20 Mar, 2015 18 commits
- Merge pull request #7353 from edx/mobile/third-party-oauth-reg · 289469dd
```
Mobile registration with Google/FB
```
  Nimisha Asthagiri committed Mar 20, 2015
  289469dd Browse Files
- Merge pull request #7436 from edx/ned/upgrade-pylint · 8a1877f0
```
Upgrade pylint
```
  Ned Batchelder committed Mar 20, 2015
  8a1877f0 Browse Files
- Lower the pylint threshold · 5a414914
  Ned Batchelder committed Mar 20, 2015
  
  5a414914 Browse Files
- Fix unidiomatic type checking · f396c115
  Ned Batchelder committed Mar 20, 2015
  
  f396c115 Browse Files
- MA-95: Update Registration endpoint to support 3rd party credentials · dfcef9dd
```
Automatically link edX account with social account in login mobile API path
```
  Nimisha Asthagiri committed Mar 20, 2015
  dfcef9dd Browse Files
- Merge pull request #7430 from edx/talbs/fix-certs-csspath · c01ab4a8
```
Certificates: Revising compiled CSS paths to match existing LMS patterns
```
  Brian Talbot committed Mar 20, 2015
  c01ab4a8 Browse Files
- Merge pull request #7378 from edx/clintonb/pay-with-oscar · 89620a33
```
Creating orders with E-Commerce API
```
  Clinton Blackburn committed Mar 20, 2015
  89620a33 Browse Files
- Course info page no longer creates enrollments. · 704e8836
```
The course info page was getting-or-creating
a course enrollment with is_active=0.  This commit
changes the operation to a "get" so that extra
enrollment records are not created.
```
  Will Daly committed Mar 20, 2015
  704e8836 Browse Files
- Updated create_order endpoint to use E-Commerce API for order creation and enrollment · 306a267d
```
This functionality is activated by adding a SKU to a non-honor course mode. When the feature is activated, verified orders will be created by the E-Commerce Service instead of LMS. After payment, the E-Commerce Service will also create the enrollment.
```
  Clinton Blackburn committed Mar 20, 2015
  306a267d Browse Files
- pylint --> 1.4.2, and pin astroid · 6c70f30d
  Ned Batchelder committed Mar 20, 2015
  
  6c70f30d Browse Files
- Merge pull request #7431 from edx/zoldak/SOL-336 · 5d65f577
```
Decorate flaky test SOL-336
```
  Jesse Zoldak committed Mar 20, 2015
  5d65f577 Browse Files
- Merge pull request #7426 from edx/adam/merge-release-to-master · d012428c
```
Adam/merge release to master
```
  Adam committed Mar 20, 2015
  d012428c Browse Files
- Decorate flaky test SOL-336 · bb4e5776
  Jesse Zoldak committed Mar 20, 2015
  
  bb4e5776 Browse Files
- certificates: revising compiled CSS paths to match existing LMS patterns · f4c3a732
  Brian Talbot committed Mar 20, 2015
  
  f4c3a732 Browse Files
- Merge pull request #7325 from edx/ahsan/tnl-1693-standarize-button-on-assessment-types · 60cb7cf3
```
Standrize buttons in assessment problems
```
  Ahsan Ulhaq committed Mar 20, 2015
  60cb7cf3 Browse Files
- Merge pull request #7380 from OmarIthawi/edraak/platform-name-in-password-reset-confirm · 90a0459e
```
Keep platform_name in the password_reset_confirm.html always TNL-1654
```
  Sarina Canelake committed Mar 20, 2015
  90a0459e Browse Files
- Merge pull request #7405 from edx/shr/bug/PLAT-466-Bad-course-about-page-value-500-error · 1e73c272
```
handle invalid-key exception for split courses
```
  Shrhawk committed Mar 20, 2015
  1e73c272 Browse Files
- handle invalid-key exception for split courses · d17a0c6a
  Syed Hassan Raza committed Mar 20, 2015
  
  d17a0c6a Browse Files
19 Mar, 2015 14 commits
- resolve more merge conflicts · 35e4e9d8
  Adam Palay committed Mar 19, 2015
  
  35e4e9d8 Browse Files
- Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master · b5c4b638
```
Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py
```
  Adam Palay committed Mar 19, 2015
  b5c4b638 Browse Files
- Merge pull request #7421 from edx/hotfix/2015-03-19 · 7abcfddf
```
Hotfix/2015 03 19
```
  Adam committed Mar 19, 2015
  7abcfddf Browse Files
- Merge pull request #7411 from edx/carol/doc/ContentLibHelpLinks · d182b8db
```
Content Libraries: Fix Help links in Import/Export templates
```
  Carol Tong committed Mar 19, 2015
  d182b8db Browse Files
- Add Help links and targets for import/export libraries · 4e9e11e4
  Carol Tong committed Mar 19, 2015
  
  4e9e11e4 Browse Files
- Merge pull request #7219 from edx/mjames/SOL-289 · 7c942ddd
```
Addresses problem with 'up' and 'down' errors within SOL-289
```
  Martyn James committed Mar 19, 2015
  7c942ddd Browse Files
- Merge pull request #7419 from edx/carol/doc/ContentLibUserAccessHelpLinks · d413e71b
```
DOC: ContentLib Help links for user access
```
  Carol Tong committed Mar 19, 2015
  d413e71b Browse Files
- Merge pull request #7394 from edx/clintonb/fix-existing-enrollment · 524840aa
```
Bypassing E-Commerce API if user is enrolled in course
```
  Clinton Blackburn committed Mar 19, 2015
  524840aa Browse Files
- Created performance logging endpoint, changed CDN experiment to point to it. · 9b79797b
  alawibaba committed Mar 19, 2015
  
  9b79797b Browse Files
- update instructor grade task state and increase logging · ae2480e0
  zubair-arbi committed Mar 19, 2015
  
  ae2480e0 Browse Files
- Bypassing E-Commerce API if user is enrolled in course · 2e2fb47d
```
If a user is already enrolled in a course, the API is bypassed and a 409 status is returned.
```
  Clinton Blackburn committed Mar 18, 2015
  2e2fb47d Browse Files
- Merge pull request #7399 from edx/ned/plat-462 · a64d9268
```
Make sure slashes in JSON content don't end script tags. PLAT-462
```
  Ned Batchelder committed Mar 18, 2015
  a64d9268 Browse Files
- Make sure slashes in JSON content don't end script tags. PLAT-462 · 6928035c
```
The string "</script>" in JSON data would end the script element we're
embedding the data in.  To make sure the data doesn't disrupt the
script, we escape the slash as \/ .
```
  Ned Batchelder committed Mar 18, 2015
  6928035c Browse Files
- Merge pull request #7414 from edx/release-merge-20150317 · e03813da
```
Merge release to master for 20150317 release.
```
  brianhw committed Mar 18, 2015
  e03813da Browse Files
18 Mar, 2015 3 commits
- Merge release to master for 20150317 release. · 243e2660
  Brian Wilson committed Mar 18, 2015
  
  243e2660 Browse Files
- Merge pull request #7418 from edx/sanchez/revert_201_status_for_enrollments · 4860837e
```
Reverting the change to add a 201_CREATED status to the enrollment API.
```
  Will Daly committed Mar 18, 2015
  4860837e Browse Files
- Update template and config.ini files for library user help · e749f450
  Carol Tong committed Mar 18, 2015
  
  e749f450 Browse Files