Commits · dd8d8fc5dd86d99cde681eee103f8adb7211cdad · edx / edx-platform · GitLab

23 May, 2014 34 commits
- Merge pull request #3831 from lduarte1991/lduarte-harvardx-image · dd8d8fc5
```
Installing Image Annotation Tool for Upcoming June 2014 Course
```
  Sarina Canelake committed May 23, 2014
  dd8d8fc5 Browse Files
- Show the menus at the top of the page. · 94f050c4
  cahrens committed May 23, 2014
  
  94f050c4 Browse Files
- Merge pull request #3860 from edx/ahodges/documentation/DOC394 · 074c4b66
```
Ahodges/documentation/doc394
```
  Alison Hodges committed May 23, 2014
  074c4b66 Browse Files
- Adding enrollment upgrade events · e3bf3d8f
  Alison Hodges committed May 23, 2014
  
  e3bf3d8f Browse Files
- Image Annotation Tool: Add linkback functionality to image thumbnails · e4e4b32c
```
Changes requested in PR
```
  lduarte1991 committed May 23, 2014
  e4e4b32c Browse Files
- Image Annotation Tool Fixes · 0318c955
```
- Added component to view

- Added correct images for OSD

- Fixed path to codemirror

- Tinymce fullscreen works now

- Pep8/Pylint Fixes

- Default image changed and added call to super
```
  lduarte1991 committed May 23, 2014
  0318c955 Browse Files
- Image Annotation Tool: Add static images for openseadragon navigation · 008bbc22
  lduarte1991 committed May 23, 2014
  
  008bbc22 Browse Files
- Image Annotation Tool: create xmodule and install js files · 32e96681
  lduarte1991 committed May 23, 2014
  
  32e96681 Browse Files
- Annotation Tools: Add helper functions and fixed pep8/pylint errors · c2425200
```
Small plugin fixes
```
  lduarte1991 committed May 23, 2014
  c2425200 Browse Files
- Merge pull request #3845 from edx/zoldak/brittle-html-editor-tests · fffdeeb9
```
Wait for ajax to complete when editing components in Studio acceptance tests
```
  Jay Zoldak committed May 23, 2014
  fffdeeb9 Browse Files
- Merge pull request #2905 from edx/opaque-keys · ecb05e6b
```
(WIP) Make course ids and Locations/Locators opaque to LMS/Studio
```
  Calen Pennington committed May 23, 2014
  ecb05e6b Browse Files
- Merge pull request #3817 from edx/gprice/forum-search-event-page · c96bf07b
```
Add page num to forum search tracking log events
```
  Greg Price committed May 23, 2014
  c96bf07b Browse Files
- Merge pull request #3857 from edx/markhoeber/documentation/doc-484 · 38e882e8
```
Fixed typo in Studio Home Page panel help text
```
  Mark Hoeber committed May 23, 2014
  38e882e8 Browse Files
- Add page num to forum search tracking log events · eb0e6c90
  Greg Price committed May 23, 2014
  
  eb0e6c90 Browse Files
- Merge pull request #3854 from edx/zoldak/skip-flaky-js-video-tests · 753189f4
```
Skip intermittently failing js video tests
```
  Jay Zoldak committed May 23, 2014
  753189f4 Browse Files
- Fixed typo in Studio Home Page panel help text · 8c4be448
```
DOC-484
```
  Mark Hoeber committed May 23, 2014
  8c4be448 Browse Files
- Merge pull request #3856 from cpennington/ok-merge-from-master · 05ca40b4
```
Merge from master to opaque-keys
```
  Calen Pennington committed May 23, 2014
  05ca40b4 Browse Files
- Resolve conflicts · 8c8cf470
  Calen Pennington committed May 23, 2014
  
  8c8cf470 Browse Files
- Merge remote-tracking branch 'edx/master' into ok-merge-from-master · 6225f4d0
```
Conflicts:
	lms/djangoapps/courseware/module_render.py
```
  Calen Pennington committed May 23, 2014
  6225f4d0 Browse Files
- Merge pull request #3834 from cpennington/ok-merge-from-master · 9feff628
```
Merge master into opaque-keys
```
  Calen Pennington committed May 23, 2014
  9feff628 Browse Files
- Skip intermittently failing js video tests · bb4f9148
  Jay Zoldak committed May 23, 2014
  
  bb4f9148 Browse Files
- Fixed DeleteComponent on Container Page. · 21ddc7db
  Nimisha Asthagiri committed May 23, 2014
  
  21ddc7db Browse Files
- Merge pull request #3805 from edx/sanchez/TIM-563-Check-Django-Admin · 23455042
```
Adding new attribute to the xmodule_runtime to check admin privileges on users
```
  Will Daly committed May 23, 2014
  23455042 Browse Files
- 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
- Adding new attribute to the xmodule_runtime to check admin privileges on users · afd55164
  Stephen Sanchez committed May 23, 2014
  
  afd55164 Browse Files
- Merge pull request #3844 from edx/sarina/lms-2748 · a0799f38
```
Sarina/lms 2748
```
  Sarina Canelake committed May 23, 2014
  a0799f38 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 6 commits
- Fix Instructor Dash UX (LMS-2748) · faeee559
  Sarina Canelake committed May 22, 2014
  
  faeee559 Browse Files
- Wait for ajax to complete when editing components in Studio acceptance tests · 4a86b926
  Jay Zoldak committed May 22, 2014
  
  4a86b926 Browse Files
- 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