Calen Pennington cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html

2014-05-22 10:52:00 -04:00

..

email

Make mako template lookups pluggable.

2014-01-31 13:55:36 -05:00

__init__.py

Factory refactor working for lms lettuce tests.

2013-03-20 09:38:52 -04:00

factories.py

Update factory_boy to 2.2.1

2013-12-05 15:50:49 -05:00

test_authz.py

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

test_auto_auth.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:54:49 -04:00

test_bulk_email_settings.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:54:49 -04:00

test_change_name.py

fix change name view by replacing the request.user simple lazy object with request.user.id

2014-04-11 18:36:49 +05:00

test_create_account.py

Ensure account creation succeeds before creating comments service user

2014-03-18 13:24:30 -04:00

test_email.py

Change user.is_authenticated to user.is_authenticated() in roles.py.

2014-04-07 12:20:20 +05:00

test_login.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:54:49 -04:00

test_long_username_email.py

Added validation for username and email max length.

2014-02-26 16:25:37 +05:00

test_password_history.py

Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets

2014-03-31 10:30:58 -04:00

test_password_policy.py

Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets

2014-03-31 10:30:58 -04:00

test_reset_password.py

Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets

2014-03-31 10:30:58 -04:00

test_roles.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 07:14:27 -04:00

test_userstanding.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:54:49 -04:00

tests.py

Merge remote-tracking branch 'edx/master' into opaque-keys

2014-05-22 10:52:00 -04:00