Victor Shnayder 6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts ...

Conflicts:
	common/djangoapps/student/models.py

2013-01-26 12:37:26 -05:00

..

contentstore

Fix bug related to creation of thumbnails for non-image files.

2013-01-16 15:40:14 -05:00

css

studio - further resolved bug with .header CSS inheritance and problem editor menu UI

2013-01-23 12:58:20 -05:00

js

fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes

2013-01-25 16:45:16 -05:00

modulestore

remove flag to hide progress tab

2013-01-23 15:11:41 -05:00

templates

update templates to include attemps and weight values. Also update capa_module.py to accept empty strings ('') to mean 'default value'

2013-01-23 16:36:16 -05:00

tests

Make all tests pass

2013-01-25 16:13:55 -05:00

util

Make tests pass again again

2012-08-07 11:08:56 -04:00

__init__.py

…

abtest_module.py

Decrease the number of queries needed for LMS courseware

2013-01-10 13:55:46 -05:00

backcompat_module.py

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

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

capa_module.py

update templates to include attemps and weight values. Also update capa_module.py to accept empty strings ('') to mean 'default value'

2013-01-23 16:36:16 -05:00

combined_open_ended_module.py

Remove mitxmako dependencies, make rubric and oechild inherit fro object

2013-01-17 17:13:31 -05:00

combined_open_ended_rubric.py

Error message fix

2013-01-17 17:18:10 -05:00

course_module.py

Merge remote-tracking branch 'origin/master' into feature/victor/cohorts

2013-01-26 12:37:26 -05:00

discussion_module.py

fix line length

2013-01-24 15:12:52 -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

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

gst_module.py

removed jstat, added javascript_loader

2013-01-17 14:22:13 +02:00

hidden_module.py

…

html_checker.py

Move files into xmodule module per comment on #326

2012-08-02 10:13:58 -04:00

html_module.py

studio - stubbed in basic LMS styling to HTML displaygst

2013-01-17 21:28:14 -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

open_ended_module.py

Remove mitxmako dependencies, make rubric and oechild inherit fro object

2013-01-17 17:13:31 -05:00

openendedchild.py

Remove mitxmako dependencies, make rubric and oechild inherit fro object

2013-01-17 17:13:31 -05: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

…

self_assessment_module.py

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

2013-01-17 20:30:22 -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

Decrease the number of queries needed for LMS courseware

2013-01-10 13:55:46 -05:00

templates.py

Squelch some (but not all, yet) errors during template loading

2012-10-24 16:25:20 -04:00

timeparse.py

Add beta test group support

2013-01-15 11:36:25 -05: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 'master' into feature/cdodge/cms-master-merge4

2013-01-17 09:15:37 -05:00

xml_module.py

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

2013-01-17 09:15:37 -05:00