edx-platform

Files

Calen Pennington 2113541632 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py

2013-03-12 07:23:28 -04:00

base

studio - resolved base variable missing issue on lms side

2013-01-22 16:31:42 -05:00

course

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-12 07:23:28 -04:00

multicourse

edx.org - university pages' main banner images are now centered when window resizes

2013-02-20 16:12:36 -05:00

shared

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

_discussion-old.scss

started adding updated styles

2012-08-29 13:22:55 -04:00

_discussion.scss

fix css for comments popping

2013-02-11 15:34:28 -05:00

_news.scss

merge with origin master

2012-08-01 14:24:46 -04:00

.gitignore

Allow for modular css from XModules, and split capa module css out as a test

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

application.scss

add

2013-01-27 17:18:55 -05:00

bourbon

ie7 fixes: define indexOf, use charAt rather than [] to access string,

2012-12-19 10:48:03 -05:00

course.scss

merge out from master

2013-02-07 17:40:54 -05:00

ie.scss

add

2013-01-27 17:19:12 -05:00

README.txt

fixed wiki bugs; started sequence nav bugs

2012-08-21 12:51:33 -04:00

README.txt

Sass Watch:

sass --watch lms/static/sass:lms/static/sass -r ./lms/static/sass/bourbon/lib/bourbon.rb