Calen Pennington 0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py

2012-11-16 09:03:15 -05:00

..

full

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

graded

Removed accidental symlink.

2012-09-20 17:41:02 -04:00

self_assessment

Add in some docs for tests, factor out class name in js

2012-11-06 09:30:59 -05:00

simple

Make the simple course pass roundtrip test:

2012-08-07 11:06:47 -04:00

test_start_date

add a course to test start dates

2012-08-21 16:21:01 -04:00

toy

fix for multiple url_name hashing bug

2012-09-06 10:12:48 -04:00

two_toys

Load grading policy from policy/{url_name}/grading_policy.json

2012-08-21 15:00:21 -04:00