Bridger Maxwell 8ebaf8a761 Merge remote-tracking branch 'origin/master' into course_start ...

Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/urls.py

2012-07-17 10:52:39 -04:00

..

askbot/skins

Add extra_filters_jinja needed for compressed_css filter

2012-07-10 16:22:05 -04:00

djangoapps

Cleaned up check_course decorator a bit.

2012-07-16 12:54:24 -04:00

envs

Merge remote-tracking branch 'origin/master' into course_start

2012-07-17 10:52:39 -04:00

lib

Merge branch 'stable-edx4edx' of github.com:MITx/mitx

2012-07-08 16:52:36 -04:00

static

renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling

2012-07-16 22:23:43 -04:00

templates

Remove duplicate entries of courses.

2012-07-17 08:25:17 -04:00

__init__.py

Moving LMS code into subdirectory

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

urls.py

Shorten course about link

2012-07-17 08:22:15 -04:00