edx-platform

Files

Chris Dodge 22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4

Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt

2013-01-17 09:15:37 -05:00

base

Merge branch 'course-info' into feature/dhm/cms-settings

2012-11-19 16:00:27 -05:00

course

Merge branch 'master' into feature/cdodge/cms-master-merge3

2013-01-11 14:04:46 -05:00

multicourse

Merge branch 'master' into feature/cdodge/cms-master-merge4

2013-01-17 09:15:37 -05:00

shared

Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations

2013-01-15 15:42:09 -05:00

_discussion-old.scss

started adding updated styles

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

_discussion.scss

styles and tiny bit of logic for community tas

2012-10-12 04:54:56 -07: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

Merge branch 'master' into feature/cdodge/cms-master-merge4

2013-01-17 09:15:37 -05:00

bourbon

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

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

course.scss

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

ie.scss

perform a new merge from master, resolve conflicts

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