Chris Dodge dfbe7dd4f9 fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict

2013-01-24 15:54:02 -05:00

..

djangoapps

fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict

2013-01-24 15:54:02 -05:00

envs

Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post

2013-01-22 23:50:38 -05:00

lib

Commented on high level functions

2013-01-22 01:40:13 -07:00

static

studio - resolved base variable missing issue on lms side

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

templates

add UTC time to registration end date

2013-01-24 01:18:10 -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

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

2013-01-22 14:47:52 -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