Commits · 671772256aabfdbe92315c263e4464d248411a3f · edx / edx-platform

10 Jul, 2014 7 commits
- 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 14 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 #4318 from edx/gprice/forum-sidebar-debt · 98d7b28c
```
Reduce tech debt in forum sidebar
```
  Greg Price committed Jul 09, 2014
  98d7b28c 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
08 Jul, 2014 10 commits
- 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
- removing unused import · ba989424
  Minh Tue Vo committed Jul 08, 2014
  
  ba989424 Browse Files
- Merge pull request #4341 from edx/db/release-script-always-fetch · 45084258
```
Always call `git fetch edx` before finding PR branches
```
  David Baumgold committed Jul 08, 2014
  45084258 Browse Files
- Always call `git fetch edx` before finding PR branches · 326ca21d
  David Baumgold committed Jul 08, 2014
  
  326ca21d Browse Files
- Merge pull request #4326 from edx/andya/fix-stud-1948 · 4cb1a510
```
Fix user handling bug in split test module
```
  Andy Armstrong committed Jul 08, 2014
  4cb1a510 Browse Files
- Fix user handling bug in split test module · afb311ff
```
STUD-1948
```
  Andy Armstrong committed Jul 08, 2014
  afb311ff Browse Files
- Merge pull request #4323 from edx/will/ora2-release-2014-07-07T19.28 · d352d4ae
```
ORA2 release-2014-07-07T19.28
```
  Will Daly committed Jul 08, 2014
  d352d4ae Browse Files
- ORA2 release-2014-07-07T19.28 · e5823375
  Will Daly committed Jul 08, 2014
  
  e5823375 Browse Files
- Merge pull request #4320 from edx/merge-rc-to-master · 115d8c64
```
Merge rc to master
```
  Adam committed Jul 08, 2014
  115d8c64 Browse Files
- Fix the link to the Ubuntu installation instructions · c460a4e6
  Ned Batchelder committed Jul 08, 2014
  
  c460a4e6 Browse Files
07 Jul, 2014 9 commits
- Allow to_deprecated_string to do its magic · 173be7d2
  Don Mitchell committed Jul 07, 2014
  
  173be7d2 Browse Files
- Asset support in split · cc6dfbbc
```
LMS-2876
```
  Don Mitchell committed Jul 07, 2014
  cc6dfbbc Browse Files
- Revert "First attempt to fix split test" · 5f11aa9a
```
This reverts commit a16f5487.
```
  Andy Armstrong committed Jul 07, 2014
  5f11aa9a Browse Files
- First attempt to fix split test · a16f5487
  Andy Armstrong committed Jul 07, 2014
  
  a16f5487 Browse Files
- Add myself to AUTHORS. · dc3dab11
  Daniel Friedman committed Jul 07, 2014
  
  dc3dab11 Browse Files
- Merge pull request #4315 from edx/bug/delete_draft · 356da9ca
```
Deleting a child of a unit should convert the unit to draft
```
  Don Mitchell committed Jul 07, 2014
  356da9ca Browse Files
- Clean up forum nav Sass · 3f6287a2
```
Now that the sidebar class is no longer used, many rules no longer need
!important and can move out of _shame.scss.
```
  Greg Price committed Jul 07, 2014
  3f6287a2 Browse Files
- Remove sidebar class from forum nav · a4de82e1
```
This will enable much cleanup of the relevant SASS rules.
```
  Greg Price committed Jul 07, 2014
  a4de82e1 Browse Files
- Merge pull request #4314 from edx/sarina/070714-language-update · cda3d296
```
Sarina/070714 language update
```
  Sarina Canelake committed Jul 07, 2014
  cda3d296 Browse Files