marco 81a2ac413d Merge branch 'release' ...

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

2013-10-01 17:05:02 -04:00

..

djangoapps

Move Pearson courseware imports to function level.

2013-09-27 12:43:27 -04:00

lib

Merge branch 'release'

2013-10-01 17:05:02 -04:00

static

Merge branch 'release'

2013-10-01 17:05:02 -04:00

templates

Verification: further revises copy per edits/typos noted

2013-09-16 14:13:14 -04:00

test

Streamline and test uploading ... remove requirement that uploads be images, can now upload any file.

2013-09-27 17:08:34 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

Pep8 autofixes

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