Adam b9bd659861 Merge pull request #6654 from edx/merge-release-into-master ...

Merge release into master

2015-01-15 16:00:38 -05:00

..

djangoapps

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

2015-01-15 14:51:34 -05:00

envs

Added the reportlab requirement to base.txt

2015-01-15 12:24:30 +05:00

lib

Studio support for cohorted courseware

2015-01-15 10:33:45 -05:00

static

Merge pull request #6583 from edx/muhhshoaib/shoppingcart-redemption-page-cross-browser-compatibility-fix

2015-01-15 14:57:05 -05:00

templates

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

2015-01-15 14:51:34 -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

Implements keyword sub feature for bulk emails

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

urls.py

Create a RESTful handle_cohort view method for GET and PUT/POST.

2015-01-15 10:33:46 -05:00

wsgi_apache_lms.py

Moved imports to manage.py and wsgi.py.

2014-10-14 18:27:31 +05:00

wsgi.py

Remove more pep8 violations

2014-11-04 07:37:41 -05:00