Greg Price 0d37b4b254 Merge branch 'release' ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py

2014-06-02 15:29:40 -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

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

test_auto_auth.py

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

test_bulk_email_settings.py

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -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_course_listing.py

Merge branch 'release'

2014-06-02 15:29:40 -04: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

Get rid of skiptests

2014-05-28 08:20:17 -04:00

test_login.py

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -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

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -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

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00