Commits · 68a0f4e45c2d7fc8d8ea5851f262a029e91832d3 · edx / edx-platform · GitLab

30 Jun, 2014 1 commit
- Fixed IE security warning on course page. · 68a0f4e4
```
LMS-2892
```
  Waheed Ahmed committed Jun 30, 2014
  68a0f4e4 Browse Files
28 Jun, 2014 2 commits
- Merge pull request #4217 from louyihua/master · d6049239
```
Fix saving error of video editor with non-english translations
```
  Nimisha Asthagiri committed Jun 28, 2014
  d6049239 Browse Files
- Merge pull request #4236 from edx/nimisha/fix_ms_merge_conflict_heartbeat · 4c717ee3
```
Fix modulestore merge conflict with heartbeat.
```
  Nimisha Asthagiri committed Jun 27, 2014
  4c717ee3 Browse Files
27 Jun, 2014 12 commits
- Merge pull request #4239 from edx/release · 13f41aea
```
Release
```
  Adam committed Jun 27, 2014
  13f41aea Browse Files
- Merge pull request #4243 from edx/ahodges/documentation/DOC657 · fae12ac0
```
Updated for PR 4106, BLD-1134
```
  Alison Hodges committed Jun 27, 2014
  fae12ac0 Browse Files
- Updated for PR 4106, BLD-1134 · b4d29274
  Alison Hodges committed Jun 27, 2014
  
  b4d29274 Browse Files
- Merge pull request #4242 from edx/ahodges/documentation/DOC367 · 5d27d77e
```
PR 2571, log stop_video event
```
  Alison Hodges committed Jun 27, 2014
  5d27d77e Browse Files
- PR 2571, log stop_video event · 44497391
  Alison Hodges committed Jun 27, 2014
  
  44497391 Browse Files
- Merge pull request #4233 from edx/alex/geoip-none-ip-fix · 7b4e806e
```
Do not look for country if no new ip.
```
  Adam committed Jun 27, 2014
  7b4e806e Browse Files
- Merge pull request #4235 from edx/ahodges/documentation/DOC639 · 2dc50ab4
```
Corrected event name in description
```
  Alison Hodges committed Jun 27, 2014
  2dc50ab4 Browse Files
- Corrected event name in description · f9a84dca
  Alison Hodges committed Jun 27, 2014
  
  f9a84dca Browse Files
- Fix modulestore merge conflict with heartbeat. · 8de4bcaf
  Nimisha Asthagiri committed Jun 27, 2014
  
  8de4bcaf Browse Files
- Do not look for country if no new ip. · 39f2aabd
  Oleg Marshev committed Jun 27, 2014
  
  39f2aabd Browse Files
- Merge pull request #4206 from edx/oleg/lti-xmlns-test · 6b50517b
```
Add test that xml body was parsed successfully.
```
  Oleg Marshev committed Jun 27, 2014
  6b50517b Browse Files
- Fix saving error of video editor in non-english translation · 7555c6ec
```
Currently the code in ```tabs-aggregator.coffee``` uses the display name of a tab as the key to index the current tab. When a non-english translation is applied, the javascript code will get localized names instead of the original english names, which causes the following ```getValue``` function fails as it cannot reference the correct tab.
Use the 'data' attribute to store the original tab name.
```
  louyihua committed Jun 27, 2014
  7555c6ec Browse Files
26 Jun, 2014 16 commits
- Merge pull request #3915 from edx/studio/uses-mixed-modulestore · b5d1ec08
```
Enable mixed modulestore
```
  Nimisha Asthagiri committed Jun 26, 2014
  b5d1ec08 Browse Files
- 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
- Add test that xml body was parsed successfully. · 56bf0ffc
  Oleg Marshev committed Jun 26, 2014
  
  56bf0ffc Browse Files
- Update the discussion area broken span tags · 3b9afe7e
```
FOR-578
```
  Waqas Khalid committed Jun 26, 2014
  3b9afe7e Browse Files
25 Jun, 2014 9 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