Bridger Maxwell 2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start ...

Conflicts:
	common/djangoapps/student/views.py

2012-07-17 12:53:27 -04:00

..

js/module

No need to append text key on HTML module save

2012-07-05 17:22:18 -04:00

modulestore

Minor changes from pull request 170

2012-07-12 11:40:02 -04:00

__init__.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

abtest_module.py

Adding comment about future of user groups

2012-07-11 22:19:34 -04:00

backcompat_module.py

Make it clear that the module for backwards compatability is just that

2012-07-11 22:19:34 -04:00

capa_module.py

Remove reset button being on all the time (for debug)

2012-07-13 13:57:29 -04:00

course_module.py

Merge remote-tracking branch 'origin/master' into course_start

2012-07-17 12:53:27 -04:00

exceptions.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

graders.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

hidden_module.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

html_module.py

Allow for more flexible candidates for replacement filepaths

2012-07-11 23:02:33 -04:00

mako_module.py

Push dependency on mitxmako up out of mako_module

2012-07-02 14:10:29 -04:00

progress.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

raw_module.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

schematic_module.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

seq_module.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

template_module.py

Get custom_tag templates using system.filestore so that they work in multicourse

2012-07-10 10:46:18 -04:00

vertical_module.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

video_module.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

x_module.py

Added a start date to courses. Created a decorator to retrieve the course and check that it is open.

2012-07-12 16:27:20 -04:00

xml_module.py

Merge remote-tracking branch 'origin/master' into course_start

2012-07-13 13:40:01 -04:00