Commits · 5d65f577eb2ab0e6d48b49a3b2c1844c9b49cd8a · edx / edx-platform · GitLab

20 Mar, 2015 7 commits
- 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
- 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 19 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
- Merge pull request #7356 from edx/ned/fix-or-remove-teardown · 6ac1b82b
```
Fix or remove tearDown methods that don't use super.
```
  Ned Batchelder committed Mar 18, 2015
  6ac1b82b Browse Files
- Merge pull request #7298 from edx/mobile/ab-test-support · d0624b27
```
MA-7: A/B test and cohorted content support
```
  Nimisha Asthagiri committed Mar 18, 2015
  d0624b27 Browse Files
- Reverting the change to add a 201_CREATED status to the enrollment API. · 4acfbbdf
  Stephen Sanchez committed Mar 18, 2015
  
  4acfbbdf Browse Files
- Merge pull request #7328 from edx/clrux/ux-1642-logistration-updates · 551c3822
```
UX-1642 Making visual tweaks and enhancements to the logistration form
```
  Chris committed Mar 18, 2015
  551c3822 Browse Files
- Add caching to partitions_service. · ff77505f
  David Ormsbee committed Mar 18, 2015
  
  ff77505f Browse Files
- Use depth=0 for call to cache_for_descriptor_descendents. · d7386ecc
  Nimisha Asthagiri committed Mar 18, 2015
  
  d7386ecc Browse Files
- Mobile API MA-7: Support A/B test and cohorted content · eca523e0
  Nimisha Asthagiri committed Mar 18, 2015
  
  eca523e0 Browse Files
- Mobile API: Modularize VideoOutline code · 091d6aeb
  Nimisha Asthagiri committed Mar 18, 2015
  
  091d6aeb Browse Files
- Merge pull request #7408 from edx/max/update-newrelic · 40dd4f1f
```
Update newrelic agent for monitoring celery tasks
```
  Max Rothman committed Mar 18, 2015
  40dd4f1f Browse Files
- Merge pull request #7377 from edx/sanchez/enrollment_api_course_modes · af4d288f
```
XCOM-45 Enrollment API supports creating modes other than honor.
```
  Stephen Sanchez committed Mar 18, 2015
  af4d288f Browse Files
- Merge pull request #7381 from edx/will/ecom-601 · f0b44920
```
Copy changes to the activation email
```
  Will Daly committed Mar 18, 2015
  f0b44920 Browse Files
- Merge pull request #7312 from edx/will/quiet-cors-middleware-logging · 4d2969b0
```
Downgrade CORS middleware warning to info
```
  Will Daly committed Mar 18, 2015
  4d2969b0 Browse Files
- Fix · 026501ae
  Chris Rodriguez committed Mar 18, 2015
  
  026501ae Browse Files
- Copy changes to the activation email · c37dc913
  Will Daly committed Mar 18, 2015
  
  c37dc913 Browse Files
- Merge pull request #7345 from edx/talbs/certs-webview-uicleanup · 6e3d5568
```
Certificates: Revising Web Templates + UI for Open edX Use
```
  Brian Talbot committed Mar 18, 2015
  6e3d5568 Browse Files
- Allow Enrollment API supports creating and upgrade course modes other than honor. · 8c9f6370
```
Fixing tests, cleaning up POST handler to be easier to read.

Wording fixed for unit test comments.
```
  Stephen Sanchez committed Mar 18, 2015
  8c9f6370 Browse Files