Calen Pennington dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	lms/static/sass/course/courseware/_courseware.scss

2012-11-13 10:22:42 -05:00

..

contentstore

lots of tweeks to better support importing of existing courseware

2012-10-30 11:52:31 -04:00

css

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

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

js

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

2012-11-13 10:22:42 -05:00

modulestore

make sure we strip away the leading '/' from the subpath for static content otherwise the naming expectations will break

2012-11-09 09:11:56 -05:00

templates

address feedback from cale

2012-11-08 13:29:46 -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

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

2012-11-13 10:22:42 -05:00

course_module.py

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

2012-11-13 10:22:42 -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

adjust implemented according to code review feedback. Move all of the grading_policy retrieval into a from_xml() override method. Also move in some of the grading inheritance logic into course_module.py

2012-10-24 12:27:30 -04: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

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

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

lots of tweeks to better support importing of existing courseware

2012-10-30 11:52:31 -04: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

Add support for subtitle download link

2012-10-23 14:50:17 -04:00

x_module.py

Revert "remove (almost) all references to askbot."

2012-11-09 18:18:37 -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