Adam Palay 3aca0d5472 Merge remote-tracking branch 'origin/release' into adam/merge-release-into-master ...

Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/bulk_email/tasks.py

2015-02-23 18:40:45 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/release' into adam/merge-release-into-master

2015-02-23 18:40:45 -05:00

envs

Merge pull request #7067 from edx/will/query-count-middleware

2015-02-23 10:46:09 -05:00

lib

Update to work with split_modulestore.

2015-02-09 09:26:05 -05:00

static

Instructor Dashboard management tools for Entrance Exams

2015-02-23 15:04:05 -05:00

templates

Instructor Dashboard management tools for Entrance Exams

2015-02-23 15:04:05 -05:00

__init__.py

…

.coveragerc

Add base support for cohorted group configurations

2014-12-05 09:52:26 -05:00

startup.py

Implements keyword sub feature for bulk emails

2014-12-11 15:03:29 -08:00

tests.py

Better support specifying of modulestore configuration in test cases

2015-02-04 09:09:14 -05:00

urls.py

ECOM-1046 adding functionality for generating the certs.

2015-02-21 04:31:32 +05:00

wsgi_apache_lms.py

…

wsgi.py

Add the ability to send SIGPROF to an edx-platform process to obtain a memory dump

2015-02-02 13:12:58 -05:00