Diana Huang 47ce9082e4 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py

2013-09-13 17:15:44 -04:00

..

contentstore

add docstrings

2013-08-20 22:45:37 -04:00

css

Removed an inclusion of t-copy-sub1 in SCSS.

2013-09-13 10:11:45 +03:00

js

Updating LTI Jasmine tests.

2013-09-12 11:07:07 +03:00

modulestore

Merge branch 'release'

2013-09-13 17:15:44 -04:00

open_ended_grading_classes

Merge branch 'release'

2013-09-13 17:15:44 -04:00

templates

Create a new response type for Numerical/Formula

2013-08-12 11:48:45 -04:00

tests

Merge branch 'release'

2013-09-13 17:15:44 -04:00

util

pylint/pep8

2013-09-12 14:30:00 -04:00

__init__.py

…

abtest_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

annotatable_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

backcompat_module.py

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

capa_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

combined_open_ended_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

conditional_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

course_module.py

Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format.

2013-09-12 14:30:00 -04:00

crowdsource_hinter.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

discussion_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

editing_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

error_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

errortracker.py

…

exceptions.py

Revert "Add custom LTI exception."

2013-09-09 19:30:44 +03:00

fields.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

foldit_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

graders.py

change graders text to unicode

2013-09-11 18:34:03 -04:00

gst_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

hidden_module.py

…

html_checker.py

…

html_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

lti_module.py

reformat for readability

2013-09-11 13:26:17 -04:00

mako_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

peer_grading_module.py

Fix linking problem for peer grading, add in a test

2013-09-13 11:09:06 -04:00

poll_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

progress.py

Blank common and advanced problems now display an inline score of '0 points' upon creation.

2013-07-24 16:44:22 -04:00

randomize_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

raw_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

seq_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

static_content.py

Fix pylint violations in xmodule static_content.py

2013-06-20 16:45:11 -04:00

stringify.py

poll and conditional finished

2013-02-15 18:48:39 +02:00

template_module.py

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00

templates.py

No longer persist XModule templates

2013-07-16 14:33:58 -04:00

timeinfo.py

fix crash in peer eval xmodule

2013-07-31 13:31:25 -07:00

timelimit_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

vertical_module.py

Update to version of xblock that supports full inheritance of field attributes

2013-03-13 14:51:10 -04:00

video_module.py

Add InheritanceKVS and standardize inherited attr patterns

2013-09-06 12:19:50 -04:00

word_cloud_module.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

wrapper_module.py

poll and conditional finished

2013-02-15 18:48:39 +02:00

x_module.py

Merge branch 'release'

2013-09-13 17:15:44 -04:00

xml_module.py

Do not store expanded action URLs.

2013-09-12 09:47:30 -04:00