Commits · 0c0859f17b4db7de68197ea0fdfb1c920a970a57 · edx / edx-platform · GitLab

25 Jun, 2014 12 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
- 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 21 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
- Merge pull request #4174 from edx/pmitros/chromeless-xblocks · 4eb234e7
```
XBlocks can disable navigation chrome.

This allows for full-screen XBlocks (such as code IDEs), as well as allowing us to somewhat hackishly build top-level XBlocks. This is the first step on the path to non-hackish top-level XBlocks. 
```
  Piotr Mitros committed Jun 23, 2014
  4eb234e7 Browse Files
- Merge pull request #4170 from lduarte1991/lduarte-harvardx-pr6 · 2b1712af
```
Annotation Tools: Removed background-color from image annotations
```
  Adam committed Jun 23, 2014
  2b1712af Browse Files
- Merge pull request #4185 from edx/will/ora2-release-2014-06-23T13.19 · 6208969d
```
ORA2 release-2014-06-23T13.19
```
  Will Daly committed Jun 23, 2014
  6208969d Browse Files
- Moved test_generate from i18n-tools · 834c2c47
  Dave St.Germain committed Jun 23, 2014
  
  834c2c47 Browse Files
- remove tests, and bump version · e6ec664a
  Dave St.Germain committed Jun 23, 2014
  
  e6ec664a Browse Files
- Moving these tools to i18n-tools repo · a6ffe8c1
  Dave St.Germain committed Jun 23, 2014
  
  a6ffe8c1 Browse Files
- Merge pull request #4180 from edx/ahodges/documentation/preface · dc22e696
```
Corrected all links in preface, added to dev and data guides
```
  Alison Hodges committed Jun 23, 2014
  dc22e696 Browse Files
- Remove FAQ link in header when disabled · ae3d9feb
  Bertrand Marron committed Jun 23, 2014
  
  ae3d9feb Browse Files
- ORA2 release-2014-06-23T13.19 · c16bdf33
  Will Daly committed Jun 23, 2014
  
  c16bdf33 Browse Files
- Merge pull request #4183 from edx/sarina/062314-language-update · f86e7dbf
```
Sarina/062314 language update
```
  Sarina Canelake committed Jun 23, 2014
  f86e7dbf Browse Files
- Update translations (autogenerated message) · 6b2164d4
  Sarina Canelake committed Jun 23, 2014
  
  6b2164d4 Browse Files
- Add possibility to run bok_choy tests in local env. · a7251e06
  Alexander Kryklia committed Jun 23, 2014
  
  a7251e06 Browse Files
- Add Amharic language · 9fb2731a
  Sarina Canelake committed Jun 23, 2014
  
  9fb2731a Browse Files
- Add Tamil language · 54cf1adb
  Sarina Canelake committed Jun 23, 2014
  
  54cf1adb Browse Files
- Pass storage_url and token values as parameters to StudentNotes init. · d36e00d4
```
LMS-2848
```
  Usman Khalid committed Jun 23, 2014
  d36e00d4 Browse Files