Commits · 62e7ecc5dda87450c29d869a8a548cbee0a10bfd · edx / edx-platform · GitLab

28 May, 2014 1 commit
- Merge pull request #3745 from edx/dhm/no-package-id · 62e7ecc5
```
Dhm/no package
```
  Don Mitchell committed May 28, 2014
  62e7ecc5 Browse Files
23 May, 2014 17 commits
- 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
- 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 22 commits
- Fix Instructor Dash UX (LMS-2748) · faeee559
  Sarina Canelake committed May 22, 2014
  
  faeee559 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
- Remove package_id and remove lower_ stuff from migrator · d24a7770
```
STUD-1603
```
  Don Mitchell committed May 22, 2014
  d24a7770 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
- Merge pull request #3830 from edx/diana/fix-cohorting · a69e42dd
```
Fix cohorting views
```
  Diana Huang committed May 22, 2014
  a69e42dd Browse Files
- Deserialze values coming into course_groups views · ae95e07c
  Diana Huang committed May 22, 2014
  
  ae95e07c Browse Files
- Merge pull request #3826 from cpennington/ok-use-deprecated-for-instructor-api · fb65aad1
```
Use old deprecated form for instructor api calls, and in staff debug info
```
  Calen Pennington committed May 22, 2014
  fb65aad1 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 #3822 from edx/sarina/course-modes-display · c7bf96f0
```
Sarina/course modes display
```
  Sarina Canelake committed May 22, 2014
  c7bf96f0 Browse Files
- Use old deprecated form for instructor api calls, and in staff debug info · 8699a13b
  Calen Pennington committed May 22, 2014
  
  8699a13b Browse Files