Merge remote-tracking branch 'origin/master' into arjun/javascript_response

Browse Source

Conflicts:
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/module_render.py

...

This commit is contained in:

Calen Pennington

2012-08-13 10:13:21 -04:00

parent b9f2d4bc13 bd95c03d9b

commit 801df37872

196 changed files with 4087 additions and 2725 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

common/static/images/sequence-nav/document-icon-current.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 203 B After Width:  |  Height:  |  Size: 204 B

BIN

common/static/images/sequence-nav/document-icon-normal.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 207 B After Width:  |  Height:  |  Size: 205 B

BIN

common/static/images/sequence-nav/document-icon-visited.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 205 B After Width:  |  Height:  |  Size: 206 B

BIN

common/static/images/sequence-nav/edit.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 168 B After Width:  |  Height:  |  Size: 171 B

BIN

common/static/images/sequence-nav/history.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 276 B After Width:  |  Height:  |  Size: 292 B

BIN

common/static/images/sequence-nav/list-icon-current.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 413 B After Width:  |  Height:  |  Size: 344 B

BIN

common/static/images/sequence-nav/list-icon-normal.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 287 B After Width:  |  Height:  |  Size: 284 B

BIN

common/static/images/sequence-nav/list-icon-visited.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 300 B After Width:  |  Height:  |  Size: 306 B

BIN

common/static/images/sequence-nav/next-icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 264 B After Width:  |  Height:  |  Size: 250 B

BIN

common/static/images/sequence-nav/other-icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 467 B After Width:  |  Height:  |  Size: 457 B

BIN

common/static/images/sequence-nav/previous-icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 241 B After Width:  |  Height:  |  Size: 243 B

BIN

common/static/images/sequence-nav/problem-icon-alt.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 300 B After Width:  |  Height:  |  Size: 300 B

BIN

common/static/images/sequence-nav/vertical-icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 830 B After Width:  |  Height:  |  Size: 845 B

BIN

common/static/images/sequence-nav/video-icon-current.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 403 B After Width:  |  Height:  |  Size: 403 B

BIN

common/static/images/sequence-nav/video-icon-normal.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 398 B After Width:  |  Height:  |  Size: 394 B

BIN

common/static/images/sequence-nav/video-icon-visited.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 416 B After Width:  |  Height:  |  Size: 425 B

BIN

common/static/images/sequence-nav/video-icon.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1.0 KiB

BIN

common/static/images/sequence-nav/view.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 229 B After Width:  |  Height:  |  Size: 234 B

BIN

common/static/images/spinner.gif Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.8 KiB