chrisndodge 791c00cd7b Merge pull request #1233 from MITx/feature/cdodge/cms-master-merge2 ...

Feature/cdodge/cms master merge2

2013-01-07 09:57:33 -08:00

..

contentstore

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

2012-12-27 14:16:40 -05:00

css

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -05:00

js

Merge pull request #1233 from MITx/feature/cdodge/cms-master-merge2

2013-01-07 09:57:33 -08:00

modulestore

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -05:00

templates

Fix typo in Formula Response name (Studio #101).

2012-12-20 17:06:12 -05:00

tests

Fix attempt tracking, fix test

2012-11-28 15:04:07 -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 branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -05:00

course_module.py

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -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

add support for utf8 in sequences, verticals and custom modules.

2012-12-04 03:54:36 -05: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

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -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

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -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

add support for utf8 in sequences, verticals and custom modules.

2012-12-04 03:54:36 -05:00

schematic_module.py

Cleaning up pep8 violations

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

self_assessment_module.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

seq_module.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -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

add support for utf8 in sequences, verticals and custom modules.

2012-12-04 03:54:36 -05: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

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -05:00

x_module.py

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

xml_module.py

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00