Commits · a9213509c38d0177b5d8bd7b6056901f39603c70 · edx / edx-platform · GitLab

26 Jun, 2014 14 commits
- Enable Mixed Modulestore STUD-1540 · a9213509
```
Refactor get_parent_locations STUD-1663
```
  Nimisha Asthagiri committed Jun 26, 2014
  a9213509 Browse Files
- Merge pull request #4073 from edx/christina/advanced-settings-hack · 580de552
```
Display names, help text, and "deprecated" for Advanced Settings.
```
  Christina Roberts committed Jun 26, 2014
  580de552 Browse Files
- Display names, help text, and "deprecated" for Advanced Settings. · a4b172d9
```
STUD-302, STUD-303
```
  cahrens committed Jun 26, 2014
  a4b172d9 Browse Files
- Merge pull request #4223 from edx/benmcmorran/increase-notification-timeout · 3c838081
```
Increases wait_for_notification timeout to 60 seconds
```
  Ben McMorran committed Jun 26, 2014
  3c838081 Browse Files
- Uses present in bokchoy test · 400731c8
  Ben McMorran committed Jun 26, 2014
  
  400731c8 Browse Files
- Increases wait_for_notification timeout to 60 seconds · ff0bab8e
  Ben McMorran committed Jun 26, 2014
  
  ff0bab8e Browse Files
- Merge pull request #4219 from edx/clytwynec/diff-cover-update · 1ce460be
```
updating diff-cover to 0.5.0
```
  clytwynec committed Jun 26, 2014
  1ce460be Browse Files
- Merge pull request #4201 from edx/jtauber/test-PR3769 · bc40dce8
```
Test PR 3769 (Improves the way LMS serves /favicon.ico)
```
  James Tauber committed Jun 26, 2014
  bc40dce8 Browse Files
- Merge pull request #3770 from mlkwaqas/waqas/for578-post-selection-broken-span · 7671005f
```
Update the discussion area broken span tags
```
  Waqas Khalid committed Jun 26, 2014
  7671005f Browse Files
- tests for PR 3769 · 238b4a5d
```
Two out of three fail without PR 3769 but all pass with PR 3769.
```
  James Tauber committed Jun 26, 2014
  238b4a5d Browse Files
- dummy theme templates for testing · 99cfea15
  James Tauber committed Jun 26, 2014
  
  99cfea15 Browse Files
- updating diff-cover to 0.5.0 · 3bd404c9
  Christine Lytwynec committed Jun 26, 2014
  
  3bd404c9 Browse Files
- Merge pull request #4105 from edx/alex/remove_unused_code_when_downloading_from_youtube · 35aacfb6
```
Remove unused code when download from youtube.
```
  Alexander Kryklia committed Jun 26, 2014
  35aacfb6 Browse Files
- Update the discussion area broken span tags · 3b9afe7e
```
FOR-578
```
  Waqas Khalid committed Jun 26, 2014
  3b9afe7e Browse Files
25 Jun, 2014 13 commits
- Merge pull request #4026 from edx/db/requests-2 · 0c0859f1
```
Upgrade `requests` module
```
  David Baumgold committed Jun 25, 2014
  0c0859f1 Browse Files
- Merge pull request #4187 from edx/will/update-ease-for-optimization · 4c5c00da
```
Update EASE to include an optimization
```
  Will Daly committed Jun 25, 2014
  4c5c00da Browse Files
- Merge pull request #4194 from edx/ahodges/documentation/relnotes20140624 · 9af8147e
```
edited and reviewed release notes
```
  Alison Hodges committed Jun 25, 2014
  9af8147e Browse Files
- edited and reviewed release notes · 52b20397
  Alison Hodges committed Jun 25, 2014
  
  52b20397 Browse Files
- Merge branch 'release' · 96e5139d
```
Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py
```
  Christine Lytwynec committed Jun 25, 2014
  96e5139d Browse Files
- Merge pull request #4167 from edx/clytwynec/rake2paver-acceptance · 03cec2e0
```
Clytwynec/rake2paver acceptance
```
  clytwynec committed Jun 25, 2014
  03cec2e0 Browse Files
- Update testing.md · 08caf81d
  clytwynec committed Jun 25, 2014
  
  08caf81d Browse Files
- Update EASE to include an optimization · ff996f2c
  Will Daly committed Jun 25, 2014
  
  ff996f2c Browse Files
- Merge pull request #2571 from Szczork/szczork/log-video-ended · 04d27a83
```
log stop_video event
```
  Anton Stupak committed Jun 25, 2014
  04d27a83 Browse Files
- Deprecating acceptance_tests from rake to paver · af9ae675
  Christine Lytwynec committed Jun 25, 2014
  
  af9ae675 Browse Files
- Remove unused code when download from youtube. · 1f5c95ba
  Alexander Kryklia committed Jun 25, 2014
  
  1f5c95ba Browse Files
- Merge pull request #4086 from edx/alex/refactor_video_test_2 · 08011284
```
Move video descriptor instantiation in tests to single place.
```
  Alexander Kryklia committed Jun 25, 2014
  08011284 Browse Files
- Move video descriptor instantiation in tests to single place. · c9afa056
  Alexander Kryklia committed Jun 25, 2014
  
  c9afa056 Browse Files
24 Jun, 2014 7 commits
- Merge pull request #3769 from shindere/favicon-fixup · 54399533
```
Improves the way LMS serves /favicon.ico
```
  James Tauber committed Jun 24, 2014
  54399533 Browse Files
- Merge pull request #4196 from edx/oleg/video-caching · 0c202cb1
```
Redirect Chinese students to a Chinese CDN for video.
```
  clytwynec committed Jun 24, 2014
  0c202cb1 Browse Files
- Merge pull request #4197 from edx/sarina/remove-en@-translations · e67155b1
```
Remove pirate and lolcat translation files to prevent accidental display
```
  clytwynec committed Jun 24, 2014
  e67155b1 Browse Files
- Remove pirate and lolcat translation files to prevent accidental display · f7c3603f
  Sarina Canelake committed Jun 24, 2014
  
  f7c3603f Browse Files
- Redirect Chinese students to a Chinese CDN for video. · 715fde27
  Oleg Marshev committed Jun 24, 2014
  
  715fde27 Browse Files
- Merge pull request #4192 from edx/adam/change-logging-level-gradding · a053dfbb
```
Lower logging level in grading condition from exception to info
```
  Adam committed Jun 24, 2014
  a053dfbb Browse Files
- Merge pull request #4181 from edx/alex/allow_bok_choy_in_dev_env · 03ad6584
```
Add possibility to run bok_choy tests in local env.
```
  Alexander Kryklia committed Jun 24, 2014
  03ad6584 Browse Files
23 Jun, 2014 6 commits
- Lower logging level in grading condition from exception to info · d9f0a6ba
```
addresses part of LMS-2907
```
  Adam Palay committed Jun 23, 2014
  d9f0a6ba Browse Files
- Merge pull request #4184 from IONISx/tusbar/add-mktg-check-dropdown · 844eaeff
```
Remove FAQ link in header when disabled
```
  Ned Batchelder committed Jun 23, 2014
  844eaeff Browse Files
- Merge pull request #3982 from edx/dcs/move-i18ntools · d9bb5365
```
Moved i18n tools to i18n-tools repo
```
  Dave St.Germain committed Jun 23, 2014
  d9bb5365 Browse Files
- Update to the i18n-tools with the underscore processing · a3cd274d
  Ned Batchelder committed Jun 23, 2014
  
  a3cd274d Browse Files
- Merge pull request #4190 from edx/usman/lms2848-htmlbooks-fix · 970d8dd2
```
Fix for htmlbooks
```
  Adam committed Jun 23, 2014
  970d8dd2 Browse Files
- Change reference to installed i18n command. · 94cd1e65
  Dave St.Germain committed Jun 23, 2014
  
  94cd1e65 Browse Files