Bridger Maxwell 6ed9f71608 Merge remote-tracking branch 'origin/master' into release/1.0 ...

Conflicts:
	lms/templates/index.html

2012-07-17 15:24:25 -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

css

Make collectstatic run to completion

2012-07-11 10:14:51 -04:00

fonts

Moving LMS code into subdirectory

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

images

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

2012-07-17 15:24:25 -04:00

images_old

wip

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

js

hooks up links from login modal to signup modal and signup modal to login modal

2012-07-16 10:27:55 -04:00

portal-icons

Moved lms/static/images/portal-icons/ to lms/static/portal-icons/, because collecstatic wants it there. We should figure out why, but it was blocking the build.

2012-07-17 15:12:58 -04:00

sass

adds one image to about page

2012-07-17 14:54:35 -04:00

staff

Moving LMS code into subdirectory

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

.gitignore

Ignoring +lms/static/sass/application.css

2012-07-16 17:11:27 -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