Calen Pennington ebe67d2d7d Merge remote-tracking branch 'origin/release/1.0' ...

Conflicts:
	common/djangoapps/student/views.py

2012-07-23 13:55:20 -04:00

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

tests

Added a filestore pointing at the directory of the file being run for xmodule tests

2012-07-20 13:31:11 -07:00

xmodule

Merge remote-tracking branch 'origin/release/1.0'

2012-07-23 13:55:20 -04:00

progress.py

Make xmodule fit the typical python installation setup

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

setup.py

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

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