Adam Palay bfcfbfab2f Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	requirements/edx/github.txt

2015-01-30 09:44:42 -05:00

..

djangoapps

Merge pull request #6818 from edx/sanchez/allow_redeem_code_upgrades

2015-01-30 09:36:43 -05:00

envs

Remove old payment and verification flow

2015-01-29 10:56:25 -05:00

lib

Courseware Search integration

2015-01-28 21:34:58 -05:00

static

ECOM-1002 fixed issue of grey background for logistration page. Also fixed focus issue when toggling between forms - as raised by @cptvitamin

2015-01-29 15:29:49 -05:00

templates

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

2015-01-30 09:44:42 -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

Courseware Search integration

2015-01-28 21:34:58 -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