Carlos Andrés Rocha 06529054de Merge hotfix 2013-07093 into master ...

Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
	common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
	common/static/coffee/src/logger.coffee
	common/templates/hinter_display.html
	lms/envs/test.py
	lms/urls.py

2013-07-03 18:55:21 -04:00

..

contentstore

Make DraftModuleStore mongo only

2013-07-01 12:33:08 -04:00

css

Merge hotfix 2013-07093 into master

2013-07-03 18:55:21 -04:00

js

Merge hotfix 2013-07093 into master

2013-07-03 18:55:21 -04:00

modulestore

Fix broken tests by simplifying the CourseFactory

2013-07-03 17:04:18 -04:00

open_ended_grading_classes

Minor pylint/whitespace changes

2013-06-25 22:34:29 -04:00

templates

Make the problem handle empty fields and non-integers correctly.

2013-06-26 12:33:55 -04:00

tests

Pylint errors

2013-07-02 10:35:27 -04:00

util

Pylint errors

2013-07-02 10:35:27 -04:00

__init__.py

…

abtest_module.py

Be strict about ModelType expected types, rename Object as Dict.

2013-06-12 14:59:17 -04:00

annotatable_module.py

Remove the stores_state field from XModule

2013-06-13 14:38:59 -04:00

backcompat_module.py

Make relative imports explicitly relative

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

capa_module.py

Rename arguments of modx_dispatch and handle_ajax related functions

2013-06-25 13:38:57 -04:00

combined_open_ended_module.py

Rename arguments of modx_dispatch and handle_ajax related functions

2013-06-25 13:38:57 -04:00

conditional_module.py

Rename arguments of modx_dispatch and handle_ajax related functions

2013-06-25 13:38:57 -04:00

course_module.py

Add docstring to CourseDescriptor.__init__

2013-06-26 14:19:33 -04:00

crowdsource_hinter.py

Fixed bug when user votes w/o permission - now displays a friendly error message instead of failing.

2013-07-02 09:54:56 -04:00

discussion_module.py

Update documentation (per Toddi).

2013-05-29 17:19:33 -04:00

editing_module.py

remove discussion cache, which isn't used

2013-04-05 15:27:50 -04:00

error_module.py

Make XModuleDescriptor use __init__ from XBlock

2013-06-17 13:38:57 -04:00

errortracker.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

exceptions.py

Have the draft module store actively prevent non-leaf nodes from being

2013-06-07 15:40:30 -04:00

fields.py

Incidental pep8 changes

2013-06-18 17:25:06 -04:00

foldit_module.py

Remove the stores_state field from XModule

2013-06-13 14:38:59 -04:00

graders.py

modify AssignmentFormatGrader to act like a SingleSectionGrader on single sections

2013-03-29 01:27:36 -04:00

gst_module.py

Incidental pep8 changes

2013-06-18 17:25:06 -04:00

hidden_module.py

Make hidden_module not cause 500 errors by adding a get_html()

2013-02-14 12:45:01 -05:00

html_checker.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

html_module.py

Incidental pep8 changes

2013-06-18 17:25:06 -04:00

mako_module.py

Make XModuleDescriptor use __init__ from XBlock

2013-06-17 13:38:57 -04:00

peer_grading_module.py

Rename arguments of modx_dispatch and handle_ajax related functions

2013-06-25 13:38:57 -04:00

plugin.py

…

poll_module.py

Rename arguments of modx_dispatch and handle_ajax related functions

2013-06-25 13:38:57 -04:00

progress.py

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04:00

randomize_module.py

Remove the stores_state field from XModule

2013-06-13 14:38:59 -04:00

raw_module.py

address some violations

2013-04-10 09:40:23 -04:00

schematic_module.py

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04:00

seq_module.py

Handle edge case when trying to aggregate progress in an empty sequence

2013-06-28 14:19:09 -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

Retrieve location from self in CustomTagDescriptor

2013-06-28 14:19:10 -04:00

templates.py

Add documentation of xmodule template files

2013-05-14 09:37:13 -04:00

timeinfo.py

Fix a few remaining tz naive dates

2013-06-17 13:26:45 -04:00

timelimit_module.py

Rename arguments of modx_dispatch and handle_ajax related functions

2013-06-25 13:38:57 -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

Fix Lyla showing up everywhere.

2013-06-26 16:30:13 -04:00

videoalpha_module.py

Fix for bug Blades/BLD-152. Added test for bugfix. Optimized bug fix.

2013-06-28 13:52:04 +03:00

word_cloud_module.py

Rename arguments of modx_dispatch and handle_ajax related functions

2013-06-25 13:38:57 -04:00

wrapper_module.py

poll and conditional finished

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

x_module.py

Rename arguments of modx_dispatch and handle_ajax related functions

2013-06-25 13:38:57 -04:00

xml_module.py

Add JSON encoder for datetimes to xml export

2013-06-28 14:19:10 -04:00