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

..

fixtures

Add the ability for Microsites to be able to send appropriately branded emails rather than the default system installed version

2014-10-08 13:04:41 -04:00

migrations

s/pylint: disable=W0621/pylint: disable=redefined-outer-name/

2014-12-01 11:22:08 -05:00

tests

split up bulk email query for students and unenrolled course staff (TNL-1332) (TNL-1143)

2015-02-23 10:58:37 -05:00

__init__.py

Add bulk email feature for instructors, with optout option

2013-08-29 12:40:31 -04:00

admin.py

Add the ability for Microsites to be able to send appropriately branded emails rather than the default system installed version

2014-10-08 13:04:41 -04:00

forms.py

Fix Pylint: E0012(bad-option-value)

2015-02-19 19:56:51 -08:00

models.py

Implements keyword sub feature for bulk emails

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

tasks.py

python standard logging

2015-02-23 11:40:41 -05:00