Commits · 29f7fe14fb608691917c0b450aa6c8d915f33949 · edx / edx-platform · GitLab

23 May, 2014 9 commits
- Merge remote-tracking branch 'edx/master' into ok-merge-from-master · 29f7fe14
  Calen Pennington committed May 23, 2014
  
  29f7fe14 Browse Files
- Merge pull request #3849 from edx/ammar/uniqe-course-fix · ff1e9466
```
Unique Course Fix
```
  muhammad-ammar committed May 23, 2014
  ff1e9466 Browse Files
- Unique Course Fix · 3919b4a4
  Muhammad Ammar committed May 23, 2014
  
  3919b4a4 Browse Files
- Merge pull request #3306 from edx/zub/bugfix/std1523-uploadassetbutton · 0054b79d
```
move upload asset code for assets to AssetsView
```
  zubair-arbi committed May 23, 2014
  0054b79d Browse Files
- Merge pull request #3850 from edx/zoldak/revert-paver-quality · 33a27259
```
Revert "added and updated pavelib/quality.py..."
```
  Jay Zoldak committed May 23, 2014
  33a27259 Browse Files
- Revert "added and updated pavelib/quality.py from dglance branch, deprecated rake quality tasks" · 4771242d
```
This reverts commit 7fd2305f.
```
  Jay Zoldak committed May 23, 2014
  4771242d Browse Files
- Merge pull request #3824 from edx/anton/fix-transcript-on-ipad · 77c3233f
```
Video: Fix transcript displaying on iPad.
```
  Anton Stupak committed May 23, 2014
  77c3233f Browse Files
- BLD-1033: Fix transcript displaying on iPad. · 2133ebd0
  polesye committed May 23, 2014
  
  2133ebd0 Browse Files
- Merge pull request #3838 from louyihua/translation-fix · b6f933a1
```
i18n: Make static strings in xmodule files extractable
```
  Andy Armstrong committed May 23, 2014
  b6f933a1 Browse Files
22 May, 2014 31 commits
- Fix bad uses of course_id/location/locator in new code on master · 35083ad9
  Calen Pennington committed May 22, 2014
  
  35083ad9 Browse Files
- Fix merge conflicts · 240fcc1d
  Calen Pennington committed May 22, 2014
  
  240fcc1d Browse Files
- Merge pull request #3840 from antoviaque/mentoring-opaque-keys · 16f0c9d1
```
mentoring-opaque-keys: Adds support for opaque keys
```
  Diana Huang committed May 22, 2014
  16f0c9d1 Browse Files
- Merge pull request #3835 from edx/zoldak/skip-brittle-test · 9f6d0594
```
Skip brittle HTML editor lettuce test
```
  Jay Zoldak committed May 22, 2014
  9f6d0594 Browse Files
- mentoring-opaque-keys: Adds support for opaque keys · 9df7e1d1
```
Updates commit hash to add support for opaque keys in mentoring. See
https://github.com/gsehub/xblock-mentoring/pull/2 for the relevant
commits.
```
  Xavier Antoviaque committed May 22, 2014
  9df7e1d1 Browse Files
- Merge pull request #3828 from edx/ammar/flaky-for-video-tests · 72cb5ec9
```
Flaky for Bok-Choy Video Tests
```
  Jay Zoldak committed May 22, 2014
  72cb5ec9 Browse Files
- Merge pull request #3837 from edx/sylvia/docs/movePA · 956b4c45
```
Update index file; change link in PA for Students
```
  srpearce committed May 22, 2014
  956b4c45 Browse Files
- i18n: Make static strings in xmodule files extractable · a6bae4d2
```
They can now be extracted.
```
  louyihua committed May 23, 2014
  a6bae4d2 Browse Files
- Update index file; change link in PA for Students · fb6dc771
  Sylvia Pearce committed May 22, 2014
  
  fb6dc771 Browse Files
- Merge pull request #3592 from edx/markhoeber/documentation/doc-389 · afe30643
```
New Open edX Install/Operations doc
```
  Mark Hoeber committed May 22, 2014
  afe30643 Browse Files
- Merge pull request #3800 from edx/markhoeber/documentation/release-notes-fix · 608eef27
```
Modified description of transcript bug fix
```
  Mark Hoeber committed May 22, 2014
  608eef27 Browse Files
- Modified description of transcript bug fix · ad8a314a
```
As well as updated the index page for usability
```
  Mark Hoeber committed May 22, 2014
  ad8a314a Browse Files
- Skip brittle test · 7db6e639
  Jay Zoldak committed May 22, 2014
  
  7db6e639 Browse Files
- Set up for new Open edX Installation and Operations Guide · b2647dab
```
doc-389
```
  Mark Hoeber committed May 22, 2014
  b2647dab Browse Files
- Merge pull request #3254 from edx/dcs/a11y-dragdrop · 7bbffd8b
```
This fixes a few accessibility problems with drag and drop
```
  Dave St.Germain committed May 22, 2014
  7bbffd8b Browse Files
- Merge pull request #3802 from louyihua/translation-fix · dfbfd7b2
```
i18n: Make checklists translatable
```
  Andy Armstrong committed May 22, 2014
  dfbfd7b2 Browse Files
- Merge pull request #3790 from edx/ahodges/documentation/DOC156 · 7044cbb8
```
Ahodges/documentation/doc156
```
  Alison Hodges committed May 22, 2014
  7044cbb8 Browse Files
- Merge pull request #3796 from edx/benpatterson/disable-course-export-acc-test · 7d8b5ad2
```
Benpatterson/disable course export acc test
```
  Ben Patterson committed May 22, 2014
  7d8b5ad2 Browse Files
- Merge remote-tracking branch 'edx/master' into opaque-keys · cd862b32
```
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
```
  Calen Pennington committed May 22, 2014
  cd862b32 Browse Files
- Flaky is a plugin for nose that automatically reruns flaky tests. · 33d01232
  Muhammad Ammar committed May 22, 2014
  
  33d01232 Browse Files
- Merge pull request #3798 from edx/ahodges/documentation/DOC402 · 9955e9e3
```
Adaptive hint correct_answer must be lc
```
  Alison Hodges committed May 22, 2014
  9955e9e3 Browse Files
- Adaptive hint correct_answer must be lc · dc00ade1
  Alison Hodges committed May 22, 2014
  
  dc00ade1 Browse Files
- Addressed review feedback. · 285c07fc
  Dave St.Germain committed May 22, 2014
  
  285c07fc Browse Files
- Merge pull request #3818 from edx/ahodges/documentation/DOC368 · 4e38b10a
```
Ahodges/documentation/doc368
```
  Alison Hodges committed May 22, 2014
  4e38b10a Browse Files
- Reorganized, updated, & streamlined sections in Running Your Course · 5ce9b418
  Alison Hodges committed May 22, 2014
  
  5ce9b418 Browse Files
- i18n: Make checklists translatable · 34d2f051
```
Now the description & action_text strings in checklists can be extracted and translated.
```
  louyihua committed May 22, 2014
  34d2f051 Browse Files
- support aria-grabbed and aria-dropeffect · 232df30b
  Dave St.Germain committed May 22, 2014
  
  232df30b Browse Files
- fixing drag and drop · f4391b5e
  Dave St.Germain committed May 22, 2014
  
  f4391b5e Browse Files
- Merge pull request #3820 from edx/dhm/bug_ok_serial_numbers · 253ed3b8
```
Dhm/bug ok serial numbers
```
  Don Mitchell committed May 22, 2014
  253ed3b8 Browse Files
- Disable cms test due to failure on master build. · dd079678
  Ben Patterson committed May 22, 2014
  
  dd079678 Browse Files
- Merge pull request #3766 from edx/zub/bugfix/std1616-editdraft · 72d9a91f
```
create draft request gets already created version if it exists
```
  zubair-arbi committed May 22, 2014
  72d9a91f Browse Files