Calen Pennington fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt

2012-07-10 13:39:19 -04:00

..

admin

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

coffee

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

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

contrib

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

courses

Fixing another static files link

2012-06-06 14:15:33 -04:00

css

Wip on sign up form.

2012-06-28 15:38:39 -04:00

fonts

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

images

refines some visual design to course objects, changes university logos on homepage, starts adding about pages and layout

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

images_old

wip

2012-06-13 14:50:25 -04:00

js

Actually add the schematic.js file used in the main.html template

2012-07-10 12:58:25 -04:00

js_old

Integrate more pages.

2012-06-14 11:27:47 -04:00

sass

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

2012-07-10 13:39:19 -04:00

sass_old

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

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

staff

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.gitignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.hgignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

green-pointer.png

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

pixel.jpg

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00