Diana Huang 90951a7bdb Merge branch 'release' ...

Conflicts:
	CHANGELOG.rst
	common/lib/xmodule/xmodule/js/fixtures/lti.html
	common/lib/xmodule/xmodule/js/spec/lti/constructor.js
	common/lib/xmodule/xmodule/js/src/lti/lti.js
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/features/certificates.py
	lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
	lms/djangoapps/courseware/tests/test_lti.py
	lms/djangoapps/shoppingcart/models.py
	lms/envs/aws.py

2013-09-12 16:03:39 -04:00

..

activation_email_subject.txt

change formatting for email messages to use full_name instead of first_ and last_name

2013-09-12 09:32:34 -04:00

activation_email.txt

change formatting for email messages to use full_name instead of first_ and last_name

2013-09-12 09:32:34 -04:00

confirm_email_change.txt

Stanfordize LMS emails

2013-06-05 10:27:25 -07:00

email_change_subject.txt

Use settings in LMS emails, not hardcoded values

2013-06-05 10:27:25 -07:00

email_change.txt

Stanfordize LMS emails

2013-06-05 10:27:25 -07:00

enroll_email_allowedmessage.txt

change formatting for email messages to use full_name instead of first_ and last_name

2013-09-12 09:32:34 -04:00

enroll_email_allowedsubject.txt

change formatting for email messages to use full_name instead of first_ and last_name

2013-09-12 09:32:34 -04:00

enroll_email_enrolledmessage.txt

change formatting for email messages to use full_name instead of first_ and last_name

2013-09-12 09:32:34 -04:00

enroll_email_enrolledsubject.txt

change formatting for email messages to use full_name instead of first_ and last_name

2013-09-12 09:32:34 -04:00

order_confirmation_email.txt

Clean up text of Order Confirmation E-mail.

2013-09-09 15:56:01 -04:00

reject_name_change.txt

Stanfordize LMS emails

2013-06-05 10:27:25 -07:00

unenroll_email_allowedmessage.txt

change formatting for email messages to use full_name instead of first_ and last_name

2013-09-12 09:32:34 -04:00

unenroll_email_enrolledmessage.txt

change formatting for email messages to use full_name instead of first_ and last_name

2013-09-12 09:32:34 -04:00

unenroll_email_subject.txt

change formatting for email messages to use full_name instead of first_ and last_name

2013-09-12 09:32:34 -04:00

welcome_body.txt

Stanfordize LMS emails

2013-06-05 10:27:25 -07:00

welcome_subject.txt

Stanfordize LMS emails

2013-06-05 10:27:25 -07:00