Bridger Maxwell d38903ac35 Merge remote-tracking branch 'origin/master' into template_caching ...

Conflicts:
	lms/static/sass/application.css

2012-07-16 23:33:40 -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

renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling

2012-07-16 22:23:43 -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

sass

Merge remote-tracking branch 'origin/master' into template_caching

2012-07-16 23:33:40 -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