Victor Shnayder 6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts ...

Conflicts:
	common/djangoapps/student/models.py

2013-01-26 12:37:26 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into feature/victor/cohorts

2013-01-26 12:37:26 -05:00

envs

Merge remote-tracking branch 'origin/master' into feature/victor/cohorts

2013-01-26 12:37:26 -05:00

lib

Merge remote-tracking branch 'origin/master' into feature/kevin/groups

2013-01-23 16:26:06 -05:00

static

studio - resolved base variable missing issue on lms side

2013-01-22 16:31:42 -05:00

templates

Merge remote-tracking branch 'origin/master' into feature/victor/cohorts

2013-01-26 12:37:26 -05:00

__init__.py

Moving LMS code into subdirectory

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

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

urls.py

Add removing students from cohorts.

2013-01-24 15:14:33 -05:00

wsgi.py

Add a wsgi file for the lms that loads the modulestores immediately after the application starts

2012-08-28 12:01:05 -04:00