Giulio Gratta 87362aa887 Merge branch 'master' of github.com:edx/mitx into feature/giulio/accessibility

2013-05-07 11:21:44 -07:00

..

admin

Pep8 autofixes

2013-02-06 11:13:50 -05:00

coffee

Remove duplicate libraries used while jasmine testing the LMS (as they are also defined in vendor)

2013-04-30 14:09:42 -04:00

contrib

Moving LMS code into subdirectory

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

css/vendor

Standardize more of css between lms and cms

2012-10-01 15:17:40 -04:00

files

Update edX media kit (LH #221)

2013-02-28 20:16:19 -05:00

fonts

Moving LMS code into subdirectory

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

images

update EPFL profile. LH # 374

2013-05-06 11:06:05 -04:00

js

Restore /faq page, and moved new content to /help

2013-01-17 10:47:50 -05:00

maintenance

adding maintenance static data

2012-08-23 08:30:04 -04:00

sass

Merge branch 'master' of github.com:edx/mitx into feature/giulio/accessibility

2013-05-07 11:21:44 -07:00

scripts

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05: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