Commits · 256c6bb4a5b9a14f2de915c3dcc5c74ca25cfb99 · edx / edx-platform

10 Jul, 2014 21 commits
- Merge pull request #4095 from edx/jtauber/open-edx-footer · 256c6bb4
```
Separate edX / Open edX footer
```
  James Tauber committed Jul 10, 2014
  256c6bb4 Browse Files
- Merge pull request #4367 from edx/sarina/i18n-course-handouts · 50709c16
```
i18n LMS and Studio components of course handouts
```
  Sarina Canelake committed Jul 10, 2014
  50709c16 Browse Files
- Separate edX / Open edX footer. · 3cb87802
```
We need to use an Open edX footer by default (and that's what all non-edx.org
instances should base their footer off) and only use the edX footer on
edx.org.

This commit uses `SITE_NAME` to determine which footer to use.

Sites using theming or micro-sites with a `SITE_NAME` not ending in `edx.org`
should not be affected.
```
  James Tauber committed Jul 10, 2014
  3cb87802 Browse Files
- Merge pull request #3858 from aboudreault/xblock-resource-missing-mimetypes · 177e8a24
```
Add missing mimetypes for xblock resources
```
  Julia Hansbrough committed Jul 10, 2014
  177e8a24 Browse Files
- Merge pull request #3191 from eduNEXT/feature/fmo/microsite-wiki · d7e6f94a
```
Feature/fmo/microsite wiki
```
  James Tauber committed Jul 10, 2014
  d7e6f94a Browse Files
- i18n LMS and Studio components of course handouts · a5dc426c
  Sarina Canelake committed Jul 10, 2014
  
  a5dc426c Browse Files
- Merge pull request #4321 from edx/ahodges/documentation/FOR595 · 19a3410b
```
Updated with UI and terminology changes
```
  Alison Hodges committed Jul 10, 2014
  19a3410b Browse Files
- Updated with UI changes in Studio and LMS, terminology · 5eb17f80
  Alison Hodges committed Jul 10, 2014
  
  5eb17f80 Browse Files
- Merge pull request #4312 from edx/ahodges/documentation/DOC158mslotke · 7d26594b
```
Edits from Michele
```
  Alison Hodges committed Jul 10, 2014
  7d26594b Browse Files
- Edits from Michele · e654c3dc
  Alison Hodges committed Jul 10, 2014
  
  e654c3dc Browse Files
- Merge pull request #4284 from edx/sylvia/docs/relnotes_7_2 · 728238ef
```
Sylvia/docs/relnotes 7 2
```
  Mark Hoeber committed Jul 10, 2014
  728238ef Browse Files
- Merge pull request #4352 from edx/release · 379edd23
```
Release
```
  Adam committed Jul 10, 2014
  379edd23 Browse Files
- Release notes for 7-9-2014 · 364ee10a
  Sylvia Pearce committed Jul 10, 2014
  
  364ee10a Browse Files
- Merge pull request #3504 from edx/dcs/LMS-1308 · 60349e3a
```
Make wiki links not look inactive. Fixes LMS-1308
```
  Dave St.Germain committed Jul 10, 2014
  60349e3a Browse Files
- Make wiki links not look inactive · 67177225
  Dave St.Germain committed Jul 10, 2014
  
  67177225 Browse Files
- Merge pull request #4307 from edx/ammar/bok-choy-video-handout-tests · cd11d5b6
```
CMS Video Handout Tests
```
  muhammad-ammar committed Jul 10, 2014
  cd11d5b6 Browse Files
- CMS Video Handout Tests · 81a5a7b9
  Muhammad Ammar committed Jul 10, 2014
  
  81a5a7b9 Browse Files
- Merge pull request #4339 from edx/nimisha/fix-user-ids · 6fa96cf0
```
Nimisha/fix user ids and LMS tests branch setting
```
  Nimisha Asthagiri committed Jul 09, 2014
  6fa96cf0 Browse Files
- Update tests to allow LMS tests to use published branch setting. · 8855b12b
```
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py
```
  Nimisha Asthagiri committed Jul 09, 2014
  8855b12b Browse Files
- Fix all modulestore calls to pass in user ids. · ea325298
  Nimisha Asthagiri committed Jul 09, 2014
  
  ea325298 Browse Files
- LMS-2947 remove get_error_courses in Split. · f5abef88
```
LMS-2950 move delete_course to Mongo.
```
  Nimisha Asthagiri committed Jul 09, 2014
  f5abef88 Browse Files
09 Jul, 2014 17 commits
- Merge pull request #4353 from edx/flowerhack/lms-deprecated-urls · 545cfd84
```
Enables LMS to handle deprecated URLs
```
  Julia Hansbrough committed Jul 09, 2014
  545cfd84 Browse Files
- Merge pull request #4285 from edx/jhelbert/enrollment-mode-change-events · 45195375
```
Jhelbert/enrollment mode change events
```
  jhelbert committed Jul 09, 2014
  45195375 Browse Files
- Enables LMS to handle deprecated URLs · d9dd4566
```
LMS-2651
```
  Julia Hansbrough committed Jul 09, 2014
  d9dd4566 Browse Files
- Merge pull request #4309 from edx/nimisha/refactor_mixed_context_managers · cd8f0e6c
```
Nimisha/refactor mixed context managers
```
  Nimisha Asthagiri committed Jul 09, 2014
  cd8f0e6c Browse Files
- This emits enrollment mode changes events · e78a398f
  Justin Helbert committed Jul 09, 2014
  
  e78a398f Browse Files
- Merge pull request #4344 from edx/christina/revert_to_published · 227205fb
```
Add revert_to_published method.
```
  Christina Roberts committed Jul 09, 2014
  227205fb Browse Files
- Move context_managers to base class, overridden by mixed. · ce9aea80
  Nimisha Asthagiri committed Jul 09, 2014
  
  ce9aea80 Browse Files
- Merge pull request #4317 from edx/zoldak/increase-sqlite-timeout · 557a2523
```
Increase the test SQLite DB timeout. TE-397
```
  Jay Zoldak committed Jul 09, 2014
  557a2523 Browse Files
- Merge pull request #4294 from edx/split_mongo_assets_cherry · 211f0797
```
Split mongo assets cherry
```
  Don Mitchell committed Jul 09, 2014
  211f0797 Browse Files
- Merge pull request #4343 from edx/mvo/removing_unused_action_chains · a5a3f625
```
Removing unused import
```
  Minh-Tue Vo committed Jul 09, 2014
  a5a3f625 Browse Files
- Add revert_to_published method. · e984ca15
```
STUD-1860
```
  cahrens committed Jul 09, 2014
  e984ca15 Browse Files
- Merge pull request #4350 from edx/gprice/for-154 · c2565396
```
Fix bug in inline discussion post creation
```
  Greg Price committed Jul 09, 2014
  c2565396 Browse Files
- Merge pull request #4318 from edx/gprice/forum-sidebar-debt · 98d7b28c
```
Reduce tech debt in forum sidebar
```
  Greg Price committed Jul 09, 2014
  98d7b28c Browse Files
- Fix bug in inline discussion post creation · c3845de7
```
Commit 994ccd11 contained a bug that caused new posts created via the
courseware interface to not get posted to the correct topic. They would
appear to work but would actually be posted to the "undefined" topic.
This has now been fixed.

JIRA: FOR-154
```
  Greg Price committed Jul 09, 2014
  c3845de7 Browse Files
- Merge pull request #4324 from edx/dan-f/add-to-authors · f9120e1d
```
Add myself to AUTHORS.
```
  Daniel Friedman committed Jul 09, 2014
  f9120e1d Browse Files
- Make pictures smaller · a74ba6b9
  Don Mitchell committed Jul 09, 2014
  
  a74ba6b9 Browse Files
- Merge pull request #4345 from edx/andy/fix-i18n-bug · 69e20595
```
Fix i18n bug on Studio's Advanced Settings page
```
  Andy Armstrong committed Jul 08, 2014
  69e20595 Browse Files
08 Jul, 2014 2 commits
- Fix i18n bug on Studio's Advanced Settings page · dbd3ffed
```
STUD-1955

HTML escaped localized text that was output to
JavaScript.
```
  Andy Armstrong committed Jul 08, 2014
  dbd3ffed Browse Files
- Merge pull request #4333 from edx/ned/fix-readme-links · eefa18b3
```
Fix the link to the Ubuntu installation instructions
```
  Ned Batchelder committed Jul 08, 2014
  eefa18b3 Browse Files