edx-platform

Files

Diana Huang dd20226ec3 Merge branch 'master' into feature/diana/rubric-input

Fix some merge issues involving rubric rendering

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py

2013-01-18 16:36:22 -05:00

base

added in completed course status to dashboard and certificate availability states

2012-11-09 18:18:36 -05:00

bourbon

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

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

course

Clean up on staff grading code path and

2013-01-15 11:21:10 -05:00

multicourse

Merge pull request #1302 from MITx/bugfix/brian/pearson-reg

2013-01-17 11:42:00 -08: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

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

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

course.scss

Add some initial css.

2012-11-30 10:03:31 -05:00

ie.scss

removed extra width

2012-12-12 17:00:54 -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