Rocky Duan 028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile ...

Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html

2012-08-18 16:57:00 -07:00

..

management

a place to start for the user profiel & fixed some bugs

2012-08-14 15:04:36 -07:00

migrations

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

__init__.py

Move student app from lms to common

2012-07-13 11:51:32 -04:00

admin.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

models.py

Merge branch 'master' of github.com:MITx/mitx into profile

2012-08-18 16:57:00 -07:00

tests.py

One more test to make sure users are really being copied

2012-08-13 13:34:24 -04:00

views.py

Account for the fact that sometimes we don't get HTTP_HOST (like for tests)

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