Commits · 65adb7b272072526763eae2e5e0fdb2fb4715c36 · edx / edx-platform · GitLab

07 Mar, 2014 2 commits
- BLD-896: Fix cc button in HTML5 videos. · 65adb7b2
  polesye committed Mar 07, 2014
  
  65adb7b2 Browse Files
- Merge pull request #2846 from edx/sarina/fix-splittest-quality · 78fe797e
```
Clean up quality violations in split_test module
```
  Sarina Canelake committed Mar 06, 2014
  78fe797e Browse Files
06 Mar, 2014 27 commits
- Clean up quality violations in split_test module · 29be1288
  Sarina Canelake committed Mar 06, 2014
  
  29be1288 Browse Files
- Merge pull request #2848 from antoviaque/xblock-mentoring-optionalapp-fix · bf754c86
```
Only add mentoring application to INSTALLED_APPS when in virtualenv
```
  Han Su Kim committed Mar 06, 2014
  bf754c86 Browse Files
- Update import location of `prefer_xmodules` · 76ae57c7
  Xavier Antoviaque committed Mar 06, 2014
  
  76ae57c7 Browse Files
- Merge pull request #2283 from carsongee/cg/feature/git_branch_import · b3ac3b6f
```
Add option for importing a course from a named branch of a git repo
```
  Carson Gee committed Mar 06, 2014
  b3ac3b6f Browse Files
- Fixed bug of checking out the same branch multiple times and code review fixes · b67b89e5
```
Translator comments and language fixes
```
  Carson Gee committed Mar 06, 2014
  b67b89e5 Browse Files
- Only add mentoring application to INSTALLED_APPS when in virtualenv · 62628f6b
  Xavier Antoviaque committed Mar 06, 2014
  
  62628f6b Browse Files
- Merge branch 'release' · 0db4a899
  Han Su Kim committed Mar 06, 2014
  
  0db4a899 Browse Files
- Merge remote-tracking branch 'origin/master' into release, conflicts resolved · bdfd81d2
```
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
```
  Han Su Kim committed Mar 06, 2014
  bdfd81d2 Browse Files
- Add option for importing a course from a named branch of a git repo · 9d55c88c
  Carson Gee committed Mar 06, 2014
  
  9d55c88c Browse Files
- Merge pull request #2702 from carsongee/cg/cas_fixes · b0af8ff4
```
Correct misaligned django-cas integration
```
  Carson Gee committed Mar 06, 2014
  b0af8ff4 Browse Files
- Add Han Su Kim to AUTHORS · 07cec318
  Ned Batchelder committed Mar 06, 2014
  
  07cec318 Browse Files
- Fix Paul-Olivier Dehaye's AUTHOR entry. · 166748a3
  Ned Batchelder committed Mar 06, 2014
  
  166748a3 Browse Files
- Merge pull request #2837 from ionis-education-group/shopping-cart-unicode-fix · 9425974b
```
Fix unicode issue in shopping cart
```
  Ned Batchelder committed Mar 06, 2014
  9425974b Browse Files
- Merge pull request #2799 from edx/markhoeber/documentation/release-notes-3-4-14 · f89396fa
```
First Draft release notes 3-3-14
```
  Mark Hoeber committed Mar 06, 2014
  f89396fa Browse Files
- Merge pull request #2719 from edx/markhoeber/documentation/stud-1314 · 4db9d0c1
```
External URL change in Files & Upoads
```
  Mark Hoeber committed Mar 06, 2014
  4db9d0c1 Browse Files
- External URL change in Files & Upoads · dd19ac64
```
STUD-1314
```
  Mark Hoeber committed Mar 06, 2014
  dd19ac64 Browse Files
- Release notes 3-3-14 · 72f127de
```
DOC-72
```
  Mark Hoeber committed Mar 06, 2014
  72f127de Browse Files
- Merge pull request #2835 from edx/dcadams/fix_class_dashboard_setting · 028e6a01
```
Moved CLASS_DASHBOARD setting into the FEATURES dict.
```
  David Adams committed Mar 06, 2014
  028e6a01 Browse Files
- Merge pull request #2839 from edx/sarina/fix-rake-i18n · d1442e7b
```
Skip generation of 'eo' files in i18n test suite
```
  Sarina Canelake committed Mar 06, 2014
  d1442e7b Browse Files
- i18n tests don't regenerate checked-in eo files · fbc76c5c
  Sarina Canelake committed Mar 06, 2014
  
  fbc76c5c Browse Files
- Merge pull request #2803 from edx/zub/bugfix/std1248-handoutlocmapp · 06c0aa53
```
add location of handouts in loc_mapper
```
  zubair-arbi committed Mar 06, 2014
  06c0aa53 Browse Files
- Merge pull request #2744 from edx/valera/move_slider_and_vcr_to_start_time_2 · b4c8e63f
```
Show start time or starting position on slider and VCR
```
  Valera Rozuvan committed Mar 06, 2014
  b4c8e63f Browse Files
- add location of handouts in loc_mapper · c17cb38c
```
STUD-1248
```
  zubiar-arbi committed Mar 06, 2014
  c17cb38c Browse Files
- Merge pull request #2762 from edx/zub/bugfix/std1336-switcheditors · 01def12d
```
properly set tinymce editor startContent
```
  zubair-arbi committed Mar 06, 2014
  01def12d Browse Files
- Fix unicode issue in shopping cart · 01c5cd5d
```
Fails when course name contains non-ascii characters.
```
  Bertrand Marron committed Mar 06, 2014
  01c5cd5d Browse Files
- Show start time or starting position on slider and VCR. · b85130bb
```
When the start time is set, or a initial position is
set,the VCR timer and the time slider should jump to
correct starting point before the video starts playing.

BLD-823
```
  Valera Rozuvan committed Mar 06, 2014
  b85130bb Browse Files
- properly set tinymce editor startContent · 84a70279
```
STUD-1336
```
  zubiar-arbi committed Mar 06, 2014
  84a70279 Browse Files
05 Mar, 2014 11 commits
- Moved CLASS_DASHBOARD setting into the FEATURES dict. · dcb169fb
  David Adams committed Mar 05, 2014
  
  dcb169fb Browse Files
- Merge pull request #2738 from edx/dbarch/mixed_ms_router · b4478081
```
Dbarch/mixed ms router
```
  Don Mitchell committed Mar 05, 2014
  b4478081 Browse Files
- Merge pull request #2821 from edx/ahodges/documentation/problemcheck · a5d9ed5b
```
Added changes for AN-609
```
  Alison Hodges committed Mar 05, 2014
  a5d9ed5b Browse Files
- Added changes for AN-609 · 293f62a7
```
changes to problem_check to support answer distribution; also provided
an example and nav in the introduction
```
  Alison Hodges committed Mar 05, 2014
  293f62a7 Browse Files
- Merge pull request #2737 from edx/dcadams/fix_tinymce · d821ac77
```
Fixes tinymce bug:
```
  David Adams committed Mar 05, 2014
  d821ac77 Browse Files
- Merge pull request #2826 from edx/ahodges/documentation.imageconversion · 6689b3f4
```
Converted 104 existing gif files to png format
```
  Alison Hodges committed Mar 05, 2014
  6689b3f4 Browse Files
- Slightly reorder the toolbar buttons so that the image button is more likely to be visible. · 4ec669c8
```
Hopefully we will get a better solution with the TinyMCE upgrade PR.
```
  cahrens committed Mar 05, 2014
  4ec669c8 Browse Files
- Converted 104 existing gif files to png format · 68d4248a
  Alison Hodges committed Mar 05, 2014
  
  68d4248a Browse Files
- xblock save only affects draft · e915a32a
```
Fix test which caused error
```
  Don Mitchell committed Mar 05, 2014
  e915a32a Browse Files
- Test special code paths in create_item · 41f5159b
  Don Mitchell committed Mar 05, 2014
  
  41f5159b Browse Files
- Add tests for get_orphans · 71ac8441
  Don Mitchell committed Mar 05, 2014
  
  71ac8441 Browse Files