Vik Paruchuri d5ba5457dc Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed ...

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

2013-02-20 16:49:59 -05:00

..

contentstore

Pep8 autofixes

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

css

Merge pull request #1510 from MITx/bug/btalbot/html-strongspan

2013-02-19 09:09:47 -08:00

js

Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed

2013-02-19 15:21:09 -05:00

modulestore

add exporting of policy.json

2013-02-14 14:19:38 -05:00

open_ended_grading_classes

Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed

2013-02-20 16:49:59 -05:00

templates

Merge pull request #1494 from MITx/feature/marco/addcomponent

2013-02-15 10:13:24 -08:00

tests

Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed

2013-02-20 16:49:59 -05:00

util

Pep8 autofixes

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

__init__.py

…

abtest_module.py

Pep8 autofixes

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

backcompat_module.py

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

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

capa_module.py

Update and clarify doc strings

2013-02-13 16:34:12 -05:00

combined_open_ended_module.py

Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed

2013-02-20 16:49:59 -05:00

conditional_module.py

Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker

2013-02-06 18:15:36 -05:00

course_module.py

On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't.

2013-02-12 13:43:03 -05:00

discussion_module.py

Pep8 autofixes

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

editing_module.py

studio html editor - sync'ed up previous style and behavior work to refactored xmodule sass/js

2013-01-16 16:55:11 -05:00

error_module.py

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

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

errortracker.py

Pep8 autofixes

2013-02-06 11:13:50 -05: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

foldit_module.py

Address Cale's comment--make property a simple class var

2013-02-14 13:24:21 -05:00

graders.py

Pep8 autofixes

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

gst_module.py

removed jstat, added javascript_loader

2013-01-17 14:22:13 +02: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

Update and clarify doc strings

2013-02-13 16:34:12 -05:00

mako_module.py

Pep8 autofixes

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

peer_grading_module.py

Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed

2013-02-20 16:49:59 -05:00

progress.py

Clamp progress to be greater than zero

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

randomize_module.py

Pep8 autofixes

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

raw_module.py

Pep8 autofixes

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

schematic_module.py

Cleaning up pep8 violations

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

seq_module.py

Pep8 autofixes

2013-02-06 11:13:50 -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

Pep8 autofixes

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

template_module.py

Pep8 autofixes

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

templates.py

clean up templates that were removed from disk - we need to remove from DB as well

2013-02-12 10:23:32 -05:00

timeinfo.py

Improve documentation

2013-02-06 15:00:08 -05:00

timelimit_module.py

change timer to calculate relative duration in javascript

2013-02-12 12:25:11 -05:00

timeparse.py

Merge branch 'master' into feature/diana/close-oe-problems

2013-02-06 13:26:22 -05:00

vertical_module.py

Pep8 autofixes

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

video_module.py

<videoalpha> tag now support multi-source

2013-02-14 11:22:12 +02:00

videoalpha_module.py

merge

2013-02-14 11:33:04 +02:00

x_module.py

Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed

2013-02-19 15:21:09 -05:00

xml_module.py

Pep8 autofixes

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