fixing unit tests

fixing merge error

fixing xqueue submission issue with unicode url (trial 0.1)

fixing fotmats as commented upon

removing yaml file language selection

Unicode changes to support QRF

removed unnecessary pass in modulestore/init.py

fixing merge error

fixing fotmats as commented upon

removing yaml file language selection

fixing pep8 violations

- fixing pylint violations

pylint violation

fixing line spaces and formats

ignore pylint E1101

remove empty line

fixing pylint violations

 pep8 violations

bulk mail unicode/decode

fix migration error

fix pep8 just to push again

more unicode/decode
Final changes to comments and error messages.

Optional Password Policy enforcement

Use status code 400 when there is a validation error in creating an account

Use status code 400 when there is a validation error in creating an account.

Note to Instructors on Regular & Beta Dashboard

Force unique course_id for bulk email authorization

LMS-2134

/register_post is an invalid URL

- Added note to instructors on Forum Admin page of Instructor Dashboard.
- Made Role Info divs permanently displayed, but under the user list.

Change the from address for LinkedIn emails

improve error reporting for reload_forum_users cmd (one-liner)

If this management command fails it's tough to figure out why without
seeing the text from the exception.  Luckily comment service does
return useful feedback, we just have to show it.  This one-line
change just add the exception text to the error message.

Before (with spurrious debug msgs removed):

    sefk@util1:~$ ./manage.sh reload_forum_users Anthonyhubendurance
    update user info to discussion failed for user with id: Anthonyhubendurance

After:

    sefk@util1:~$ ./manage.sh reload_forum_users Anthonyhubendurance
    update user info to discussion failed for user with id: Anthonyhubendurance, error=u'["Email is already taken"]'

No unit testing (sorry) added since this doesn't have coverage
already, and it's just a simple error case.

LMS: Quick Clean Up of Old Index

Ability to lock out accounts for N seconds after M failed login attempts

update test to reflect that the non-microsite homepage has been changed to remove all the partnership content

LMS-2121

LMS-2121

Export conversion script

Django command for migrating courses to split-mongo (and deleting)

STUD-1196

Add role parameter to LTI. BLD-583.

Fixed allowing for execution of arbitrary Javascript in student response

ORA-256

Video: Fix speed persistence per video.

Updated internal documentation on MongoDB.

Add optional feature to lock out accounts after N failed login attempts. Lockouts will last M seconds.

add DB migration and fix earlier mistakes in student migration history

add tests and fix bugs that came out of those unit tests

remove unused import

pep8/pylint

address some PR feedback

fix tests

fix broken test

try to mock time

use freeze-gun to overload the system time to simulate the future

Conflicts:
	requirements/edx/base.txt

Move doc_url function out of edxmako middleware