Conflicts: cms/djangoapps/contentstore/tests/test_contentstore.py cms/djangoapps/contentstore/views/component.py cms/djangoapps/contentstore/views/item.py cms/djangoapps/contentstore/views/preview.py cms/djangoapps/contentstore/views/tests/test_container.py cms/static/js/spec/views/unit_spec.js cms/static/js/utils/module.js cms/templates/container.html cms/templates/studio_vertical_wrapper.html cms/templates/studio_xblock_wrapper.html common/djangoapps/student/views.py lms/templates/notes.html lms/templates/textannotation.html lms/templates/videoannotation.html
Name |
Last commit
|
Last update |
---|---|---|
.tx | Loading commit data... | |
cms | Loading commit data... | |
common | Loading commit data... | |
conf/locale | Loading commit data... | |
docs | Loading commit data... | |
i18n | Loading commit data... | |
jenkins | Loading commit data... | |
lms | Loading commit data... | |
pavelib | Loading commit data... | |
proxy | Loading commit data... | |
rakelib | Loading commit data... | |
requirements | Loading commit data... | |
scripts | Loading commit data... | |
test_root | Loading commit data... | |
vendor_extra/tinymce | Loading commit data... | |
.gitattributes | Loading commit data... | |
.gitignore | Loading commit data... | |
.jshintrc | Loading commit data... | |
.pep8 | Loading commit data... | |
.reviewboardrc | Loading commit data... | |
.ruby-gemset | Loading commit data... | |
.ruby-version | Loading commit data... | |
AUTHORS | Loading commit data... | |
Brewfile | Loading commit data... | |
CHANGELOG.rst | Loading commit data... | |
CONTRIBUTING.rst | Loading commit data... | |
Gemfile | Loading commit data... | |
Gemfile.lock | Loading commit data... | |
LICENSE | Loading commit data... | |
README.md | Loading commit data... | |
manage.py | Loading commit data... | |
mongo_indexes.md | Loading commit data... | |
package.json | Loading commit data... | |
pavement.py | Loading commit data... | |
pylintrc | Loading commit data... | |
rakefile | Loading commit data... | |
setup.cfg | Loading commit data... | |
setup.py | Loading commit data... |