Commits · 590a64bed1e87f35a589e692d967499273ef5ddb · edx / edx-platform

06 May, 2015 1 commit
- resolve path differences with coverage combine using a coveragerc file specifically for jenkins · 590a64be
```
Conflicts:
	scripts/jenkins-report.sh
```
  Christine Lytwynec committed May 06, 2015
  590a64be Browse Files
04 May, 2015 10 commits
- Revert "Revert "Clytwynec/unique dirs for test results"" · 41a9e027
```
This reverts commit 52c4aaca.
```
  Christine Lytwynec committed May 04, 2015
  41a9e027 Browse Files
- Merge pull request #7904 from edx/revert-7709-clytwynec/unique-dirs-for-test-results · e9521432
```
Revert "Clytwynec/unique dirs for test results"
```
  Christine Lytwynec committed May 04, 2015
  e9521432 Browse Files
- Merge pull request #7870 from mitocw/feature/cg/disable_ssl_cache · 3169825a
```
Remove anonymous caching when SSL is enabled
```
  Sarina Canelake committed May 04, 2015
  3169825a Browse Files
- Revert "Clytwynec/unique dirs for test results" · 52c4aaca
  Christine Lytwynec committed May 04, 2015
  
  52c4aaca Browse Files
- Merge pull request #7899 from edx/benp/annotation-flaky · fad6ad77
```
Flag test as flaky.
```
  Ben Patterson committed May 04, 2015
  fad6ad77 Browse Files
- Merge pull request #7709 from edx/clytwynec/unique-dirs-for-test-results · 4f5aeb3f
```
Clytwynec/unique dirs for test results
```
  Christine Lytwynec committed May 04, 2015
  4f5aeb3f Browse Files
- Flag test as flaky. · 0847f8c2
  Ben Patterson committed May 04, 2015
  
  0847f8c2 Browse Files
- Merge pull request #7849 from edx/zub/story/reverification-sevice-get-attempts-method · 7a1060cf
```
add 'get_attempts' method for 'ReverificationService'
```
  zubair-arbi committed May 04, 2015
  7a1060cf Browse Files
- Merge pull request #7797 from edx/aj/tnl2008-stop-video-event-not-emitted-correctly · 1ec7dc81
```
Videos should emit `stop_video` event once the video segment is compelte...
```
  Awais Jibran committed May 04, 2015
  1ec7dc81 Browse Files
- Merge pull request #7829 from edx/aj/tnl1530-discussion-section-jump-to-bottom · e9f26a99
```
Switching between discussion threads take focus to bottom of the page.
```
  Awais Jibran committed May 04, 2015
  e9f26a99 Browse Files
02 May, 2015 2 commits
- Merge pull request #7822 from edx/clintonb/receipt-page-update · bfb201ec
```
Updated Receipt Page for Oscar
```
  Clinton Blackburn committed May 02, 2015
  bfb201ec Browse Files
- Added Oscar-Compatible Receipt Page · 1a1fe56b
  Clinton Blackburn committed May 02, 2015
  
  1a1fe56b Browse Files
01 May, 2015 11 commits
- Merge pull request #7751 from edx/ahsan/tnl-1677-numerical-input-accessibility-problem · 436453e7
```
Numerical Input assessment has multiple accessibilty issues
```
  Ahsan Ulhaq committed May 01, 2015
  436453e7 Browse Files
- Numerical Input assessment has multiple accessibilty issues · 918afe64
```
TNL-1677
```
  Ahsan Ulhaq committed May 01, 2015
  918afe64 Browse Files
- Merge pull request #7816 from open-craft/ekolpakov/children-import-fix · 4d076fce
```
Fixed loosing children in drafts on import
```
  Eugeny Kolpakov committed May 01, 2015
  4d076fce Browse Files
- Merge pull request #7885 from edx/will/credit-through-enrollment-api · 6ed41b22
```
Enrollment API course details include credit modes.
```
  Will Daly committed May 01, 2015
  6ed41b22 Browse Files
- Enrollment API course details include credit modes. · 5d16ed46
```
Credit modes are hidden by default, since the user
isn't allowed to select them on the track selection page.
This commit exposes credit modes through the enrollment
API so that consumers can see that a course has a credit
track.
```
  Will Daly committed May 01, 2015
  5d16ed46 Browse Files
- Fixes for course import-export: · 6db974c8
```
* Updated XBlock hash - new version forces exposes force_dirty method on fields
* Includes Scope.children fields into xml_importer._update_module_location so that they are updated as well.
* Tests for mutable fields xml_importer._update_module_location with mutable fields and children
```
  E. Kolpakov committed May 01, 2015
  6db974c8 Browse Files
- Merge pull request #7851 from edx/benp/pep8-pycharm-helpers · 270ac747
```
Pep8 should ignore pycharm-helpers files on folks' workstations/VMs.
```
  Ben Patterson committed May 01, 2015
  270ac747 Browse Files
- Merge pull request #7879 from edx/will/restore-remember-me · f6e8ce24
```
Add remember me checkbox back to the combined login/registration page
```
  Will Daly committed May 01, 2015
  f6e8ce24 Browse Files
- Merge pull request #7850 from edx/benp/bok-choy-shard-5 · 8cd5f42c
```
Add bok-choy shards 4 and 5. New default is 'shard 6'
```
  Ben Patterson committed May 01, 2015
  8cd5f42c Browse Files
- Merge pull request #7880 from edx/ned/pedantic-fix-for-deleting-pyc-files · cc8c7e7c
```
Don't delete *.pyc files in the .git directory
```
  Ned Batchelder committed May 01, 2015
  cc8c7e7c Browse Files
- Merge pull request #7654 from edx/mjames/SOL-280 · c776272a
```
Index course information alongside courseware
```
  Martyn James committed Apr 30, 2015
  c776272a Browse Files
30 Apr, 2015 16 commits
- Don't delete *.pyc fils in the .git directory · 72c09910
```
If you have a branch named "remove-all-.pyc", the original code would
clobber it inside the .git directory, because branches become files with
the same name.  This prevents find from looking in .git, saving your
precious oddly named branches.
```
  Ned Batchelder committed Apr 30, 2015
  72c09910 Browse Files
- Merge pull request #7767 from edx/gprice/discussion-api-topics · c006befd
```
Add discussion topic API
```
  Greg Price committed Apr 30, 2015
  c006befd Browse Files
- Add bok-choy shards 4 and 5. When no shard is specified on a test, it · 5f0cd587
```
will fall in 'shard 6'
```
  Ben Patterson committed Apr 30, 2015
  5f0cd587 Browse Files
- Add remember me checkbox back to the combined login/registration page · 05baddb2
  Will Daly committed Apr 30, 2015
  
  05baddb2 Browse Files
- fix typo in jenkins-report.sh · 67ee6469
  Christine Lytwynec committed Apr 30, 2015
  
  67ee6469 Browse Files
- Merge pull request #7835 from edx/release · af3519ce
```
Release (DO NOT MERGE)
```
  Adam committed Apr 30, 2015
  af3519ce Browse Files
- Index course information alongside courseware · b9f1c5db
```
Conflicts:
	cms/djangoapps/contentstore/tests/test_courseware_index.py
```
  Martyn James committed Apr 30, 2015
  b9f1c5db Browse Files
- Add discussion topic API · ebff94af
```
This is the first stage of the new Discussion API.

JIRA: MA-604
```
  Greg Price committed Apr 30, 2015
  ebff94af Browse Files
- Merge pull request #7875 from edx/sarina/20150430-translations-update · 22d818e0
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Apr 30, 2015
  22d818e0 Browse Files
- Update translations (autogenerated message) · 78684903
  Sarina Canelake committed Apr 30, 2015
  
  78684903 Browse Files
- Merge pull request #7844 from edx/ahsan/AC-97-aria-describedby-broken-id-ref-sign-in-page · 1e5cbbef
```
aria-describedby has broken IDref on Sign in email form
```
  Ahsan Ulhaq committed Apr 30, 2015
  1e5cbbef Browse Files
- Merge pull request #7358 from edx/ned/add_dunder_init_files · 6fd60f21
```
Add missing __init__.py files
```
  Ned Batchelder committed Apr 30, 2015
  6fd60f21 Browse Files
- Remove anonymous caching when SSL is enabled · 681b9a5e
  Carson Gee committed Apr 30, 2015
  
  681b9a5e Browse Files
- Merge pull request #7865 from edx/clytwynec/update-flaky-version · 7982ad4e
```
update version of flaky to 2.0.3
```
  Christine Lytwynec committed Apr 30, 2015
  7982ad4e Browse Files
- Have to increase the pylint limit now that we examine more files · 3417672d
  Ned Batchelder committed Apr 30, 2015
  
  3417672d Browse Files
- Merge pull request #7811 from edx/awais786/ECOM-1284-re-generate-certs · e4657337
```
ECOM-1284  enabling re-generate certs.
```
  Awais Qureshi committed Apr 30, 2015
  e4657337 Browse Files