Don Mitchell 0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into ...

feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py

2012-12-11 10:55:10 -05:00

..

contentstore

wire through course asset path information to the video playback module and corresponding .coffee files

2012-11-26 11:19:51 -05:00

css

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-02 11:09:19 -04:00

js

assume that users are putting caption information in /static/subs. We'll enforce this on the xlint utility

2012-11-26 11:19:51 -05:00

modulestore

Show error if organization name has invalid characters

2012-12-10 15:19:34 -05:00

templates

Everything tested and ready for Tom to fix

2012-11-30 10:40:19 -05:00

tests

merge in origin/master

2012-11-12 13:10:21 -05:00

util

Make tests pass again again

2012-08-07 11:08:56 -04:00

__init__.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

abtest_module.py

Squelch some (but not all, yet) errors during template loading

2012-10-24 16:25:20 -04:00

backcompat_module.py

remove no-longer-need < escape. Re #466

2012-08-21 13:29:11 -04:00

capa_module.py

make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter

2012-11-29 15:56:03 -05:00

course_module.py

Grading mostly working

2012-12-10 16:32:33 -05:00

discussion_module.py

basic templates for video, html, discussion, and sequential

2012-09-25 13:47:45 -04:00

editing_module.py

added code mirror styles

2012-10-03 09:47:19 -04:00

error_module.py

Fix up ErrorDescriptor._construct, and use in in ErrorDescriptor.from_json

2012-09-25 10:10:44 -04:00

errortracker.py

more general catch for gunicorn sync error

2012-09-03 20:37:33 -04:00

exceptions.py

Return a custom error for duplicate elements, and ignore it when loading into mongo

2012-07-30 13:16:21 -04:00

graders.py

Remove 'name' property if it exists in an AssignmentFormatGrader. Don and I decided to do this instead of throwing an xlint warning and forcing authors to delete the name property.

2012-12-10 11:50:21 -05:00

hidden_module.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

html_checker.py

Move files into xmodule module per comment on #326

2012-08-02 10:13:58 -04:00

html_module.py

first pass at static tab editing. Doesn't yet support drag/drop as well as new tab creation, which needs to modify the policy on the course

2012-11-07 15:27:44 -05:00

mako_module.py

Define 'system metadata' which should not be editable by the end user. When posting back metadata edits, we need to fetch a copy of the existing metadata and apply the changes.

2012-09-24 16:54:46 -04:00

progress.py

Clamp progress to be greater than zero

2012-09-06 15:23:19 -04:00

raw_module.py

Make separate json and xml editing interfaces

2012-09-25 10:10:44 -04:00

schematic_module.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

self_assessment_module.py

only ask for hints if assessed as wrong

2012-11-12 16:23:58 -05:00

seq_module.py

initial xlint implementation. Accumulate all import errors during XmlModuleStore importing. Also do checks post XmlModuleStore import and assert that the structure (course->chapter->sequential->vertical) is present in the courses.

2012-11-09 13:54:12 -05:00

static_content.py

Make edit and delete buttons show up on cms unit editing page

2012-10-01 15:17:41 -04:00

stringify.py

Fix inline html bug.

2012-08-28 19:54:57 -04:00

template_module.py

fix crash with working with custom tags with XML filestore

2012-11-29 13:24:41 -05:00

templates.py

Squelch some (but not all, yet) errors during template loading

2012-10-24 16:25:20 -04:00

timeparse.py

Make start dates work for all modules

2012-08-14 23:30:37 -04:00

vertical_module.py

remove template_dir_name from Vertical and Sequence descriptors so that it uses the default template dir

2012-10-04 14:53:43 -04:00

video_module.py

assume that users are putting caption information in /static/subs. We'll enforce this on the xlint utility

2012-11-26 11:19:51 -05:00

x_module.py

Merge remote-tracking branch 'origin/feature/cale/cms-master' into

2012-12-11 10:55:10 -05:00

xml_module.py

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info

2012-11-07 09:35:21 -05:00