Jean Manuel Nater 78128e7672 Merge branch 'master' into jnater/playground ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	lms/djangoapps/courseware/tests/tests.py

2013-06-18 13:36:24 -04:00

..

management

Move tz_aware into connection config rather than settings.

2013-06-10 17:16:35 -04:00

migrations

Modifications to instructor dashboard - enrollment tab:

2013-04-29 09:38:10 -07:00

tests

Squash 3 more naive datetime warnings. I think the only ones left are in

2013-06-13 10:56:48 -04:00

__init__.py

Move student app from lms to common

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

admin.py

add offline grade computation & DB table for this

2013-01-10 23:32:48 -05:00

models.py

Move tz_aware into connection config rather than settings.

2013-06-10 17:16:35 -04:00

views.py

Merge branch 'master' into jnater/playground

2013-06-18 13:36:24 -04:00