Commits · 192d701899c9751acf159745e5e670bc1467f15f · edx / edx-platform · GitLab

11 Aug, 2014 1 commit
- Code review changes re split import/export, create_xblock · 192d7018
  Don Mitchell committed Aug 11, 2014
  
  192d7018 Browse Files
08 Aug, 2014 32 commits
- More branch override precedence refinement · 21c6812b
  Don Mitchell committed Aug 08, 2014
  
  21c6812b Browse Files
- Disable fetching by version guid for now · f69ef41c
  Don Mitchell committed Aug 08, 2014
  
  f69ef41c Browse Files
- Use continue version for create course side effects · 67d6347e
  Don Mitchell committed Aug 08, 2014
  
  67d6347e Browse Files
- Support import of ErrorDescriptors. · ba8d390f
  Nimisha Asthagiri committed Aug 08, 2014
  
  ba8d390f Browse Files
- Use new check counter & bump count · ae4277c4
  Don Mitchell committed Aug 08, 2014
  
  ae4277c4 Browse Files
- Support xml blocks w/ multiple parents · 7a75b94f
  Don Mitchell committed Aug 08, 2014
  
  7a75b94f Browse Files
- Provide workarounds for skip_draft where other code doesn't want its behavior · e900a47b
  Don Mitchell committed Aug 08, 2014
  
  e900a47b Browse Files
- Move about overview creation to common superclass · 5fc30dc4
  Don Mitchell committed Aug 08, 2014
  
  5fc30dc4 Browse Files
- fixup - re-enable Asset checking. · 70c77f48
  Nimisha Asthagiri committed Aug 08, 2014
  
  70c77f48 Browse Files
- Import depth first to help w/ publishing · 9254cfa9
  Don Mitchell committed Aug 08, 2014
  
  9254cfa9 Browse Files
- Trying to get split to work · 2726b437
  Don Mitchell committed Aug 08, 2014
  
  2726b437 Browse Files
- Add make_course_key to modulestores, so that external clients don't need to… · b87d469c
```
Add make_course_key to modulestores, so that external clients don't need to assume a CourseKey subtype.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
```
  Calen Pennington committed Aug 08, 2014
  b87d469c Browse Files
- Refactor xml_importer.py for easier reading. · 84992cdf
```
Remove post-publish step.
```
  Nimisha Asthagiri committed Aug 08, 2014
  84992cdf Browse Files
- Replace create_xmodule with create_xblock · 47851c50
```
Refactor all callers (often replacing with more appropriate fn)

Also, added for_branch_setting method to old mongo and removed some
branch verification tests

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
```
  Don Mitchell committed Aug 08, 2014
  47851c50 Browse Files
- Merge pull request #4720 from edx/split/add-and-fixes · 9efe5d92
```
Split/add and fixes
```
  Nimisha Asthagiri committed Aug 08, 2014
  9efe5d92 Browse Files
- Merge pull request #4736 from edx/usman/lms11205-embargomiddleware-invalidkeyerror · 26b08a02
```
Catch InvalidKeyError in course_id_from_url().
```
  Adam committed Aug 08, 2014
  26b08a02 Browse Files
- get_items API: have qualifiers be a separate parameter instead of assuming kwargs. · d2b59cb6
  Nimisha Asthagiri committed Aug 08, 2014
  
  d2b59cb6 Browse Files
- Incomplete course ids should return a 404. · f9ee21f4
  Usman Khalid committed Aug 08, 2014
  
  f9ee21f4 Browse Files
- Merge pull request #4743 from edx/flowerhack/fix-upgrade-message · 1d64b50d
```
Basic fix for upgrade text bug
```
  Julia Hansbrough committed Aug 08, 2014
  1d64b50d Browse Files
- Merge pull request #4716 from edx/anton/studio-tooltip-manager · 5bf38806
```
Studio: Add tooltips.
```
  Anton Stupak committed Aug 08, 2014
  5bf38806 Browse Files
- Basic fix for upgrade text bug · 3de1ab83
  Julia Hansbrough committed Aug 08, 2014
  
  3de1ab83 Browse Files
- Merge pull request #4752 from edx/will/ora2-release-2014-08-08T13.47 · 6d263fe4
```
ORA2 release-2014-08-08T13.47
```
  Will Daly committed Aug 08, 2014
  6d263fe4 Browse Files
- Merge pull request #4744 from edx/clytwynec/remove_flaky_decorator_from_tests · 8c8d388d
```
removing "flaky" plugin, since it is not reporting failures properly
```
  clytwynec committed Aug 08, 2014
  8c8d388d Browse Files
- ORA2 release-2014-08-08T13.47 · 949c9656
  Will Daly committed Aug 08, 2014
  
  949c9656 Browse Files
- Add tooltip manager in Studio. · 37c3a50f
  polesye committed Aug 08, 2014
  
  37c3a50f Browse Files
- Merge pull request #4747 from rocha/update-authors · 80ee7e99
```
Update AUTHORS file
```
  Carlos Andrés Rocha committed Aug 08, 2014
  80ee7e99 Browse Files
- Catch InvalidKeyError in course_id_from_url(). · 131c8cbf
```
LMS-9663
```
  Usman Khalid committed Aug 08, 2014
  131c8cbf Browse Files
- Address code coverage and quality. · 775b50a7
  Nimisha Asthagiri committed Aug 08, 2014
  
  775b50a7 Browse Files
- Merge pull request #4742 from edx/will/ora2-release-2014-08-07T20.03 · dcee518d
```
ORA2 release-2014-08-07T20.03
```
  Will Daly committed Aug 08, 2014
  dcee518d Browse Files
- Update AUTHORS file · 8fce758b
  Carlos Andrés Rocha committed Aug 07, 2014
  
  8fce758b Browse Files
- Make Split Course work with new Publishing UI. · 934d4e8a
  Nimisha Asthagiri committed Aug 07, 2014
  
  934d4e8a Browse Files
- Fix get_courses. · f10bcc1e
  Nimisha Asthagiri committed Aug 07, 2014
  
  f10bcc1e Browse Files
07 Aug, 2014 7 commits
- ORA2 release-2014-08-07T20.03 · 228aa771
  Will Daly committed Aug 07, 2014
  
  228aa771 Browse Files
- LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL. · abbfa95e
```
Make default_store thread-safe.
```
  Nimisha Asthagiri committed Aug 07, 2014
  abbfa95e Browse Files
- LMS-11019 Add feature flag to create Split Course · e9db4ad1
  Nimisha Asthagiri committed Aug 07, 2014
  
  e9db4ad1 Browse Files
- LMS-11179 Fix Assets with Split · ec301163
  Nimisha Asthagiri committed Aug 07, 2014
  
  ec301163 Browse Files
- LMS-11177 Add Split to configuration settings. · a55b406c
  Nimisha Asthagiri committed Aug 07, 2014
  
  a55b406c Browse Files
- ORA2 hotfix 2014-08-06 · cc624fd6
  Will Daly committed Aug 07, 2014
  
  cc624fd6 Browse Files
- Updating ORA2 hash for hotfix August 5th, 2014 · 4d8ef18c
  Stephen Sanchez committed Aug 07, 2014
  
  4d8ef18c Browse Files