David Ormsbee 73fb8f5464 Merge branch 'hotfix/1.0.3' ...

Conflicts:
	lms/urls.py

2012-08-02 11:51:50 -04:00

..

admin

Moving LMS code into subdirectory

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

coffee

Standardize how JS XModules are instantiated

2012-07-24 16:14:04 -04:00

contrib

Moving LMS code into subdirectory

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

css/vendor

Fixed jquery ui image problem and added a base style sheet for lms to override fonts

2012-07-31 11:06:39 -04:00

fonts

Moving LMS code into subdirectory

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

images

Fixed jquery ui image problem and added a base style sheet for lms to override fonts

2012-07-31 11:06:39 -04:00

js

Fixed jquery ui image problem and added a base style sheet for lms to override fonts

2012-07-31 11:06:39 -04:00

sass

Merge branch 'hotfix/1.0.3'

2012-08-02 11:51:50 -04:00

staff

Moving LMS code into subdirectory

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

.gitignore

Added Gemfile.lock to ignore

2012-07-30 09:51:50 -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