Calen Pennington d8f8d8c656 Merge branch 'release/1.0' ...

Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py

2012-07-24 08:52:50 -04:00

..

admin

Moving LMS code into subdirectory

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

coffee

Hook up forms for forgot password functionality.

2012-07-17 16:27:30 -04:00

contrib

Moving LMS code into subdirectory

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

css/vendor

Changed around the css

2012-07-23 12:38:21 -04:00

fonts

Moving LMS code into subdirectory

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

images

Remove very large, no longer used images

2012-07-24 00:05:13 -04:00

images_old

wip

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

js

Fixed bugs caused by modal cloning. Now, only video modals are cloned.

2012-07-23 19:19:27 -04:00

sass

Merge branch 'release/1.0'

2012-07-24 08:52:50 -04:00

staff

Moving LMS code into subdirectory

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

.gitignore

Ignoring ie.css

2012-07-22 15:27:49 -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