Renamed conflicting migration file

This reverts commit 04429e77.

Mark VideoTimesTest.test_video_end_time_wo_default_start_time as flaky

Missing accessible label in lms <nav> elements.

Benp/static code analysis radon

i18n some strings in LmsBlockMixin

Disable test that's too flaky for our flaky policy.

ECOM-1142: Management command for error certs.

Add Staff Graded Assignments XBlock to edx-platform

Fixed an import issue with django settings - in xblock authoring module.

footer <nav> accessibility issue

Inaccessible label for the page action Navigation

Course settings nav accessibility issue Studio

No "Main" region landmark on Student Dashboard

Diff-cover moved

fix bok-choy reporting on failure

Skip entrance exam feature on instructor dashboard

Add a management comand to regenerate certificates with
status 'error', optionally restricted to a subset
of courses.

Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset

Quality improvements 1/16

added rescore, delete state and task history functionality

added unit tests for entrance exam reset attempts

added unit tests for re scoring of entrance exam and task history

improved test coverage

Got rid of pep violation

feedback changes and added jasmine test

added more jasmine tests for Javascript changes

added bok-choy tests for UI changes

replaced input containing <p> tags with <label>

Removed ee element assertions to avoid js error

Added call to super.setUp()

changes based on feedback on 2/18

Writing tests in JS instead of coffee script

commit related to skip entrance exam 2/13

fixed bad-continuation quality error

fixed broken bok-choy test

changes based on feedback on 2/18

added js tests and removed coffee script tests

fixed broken bok-choy and unit tests

changes left while rebasing

rephrase test titles

do not need these libs

changes based on feedback on 2/24

changes text which was left

Changes based on feedback on 3/3

Deprecate old embargo implementation.

Store count of pep8 and pylint violations to files in reports dir

Fix issues with non-unique discussion targets

Merge release to master

added links to docs for listed libraries in overview.md

Flag test as flaky. SOL-449.

Bnotions/social features

Conflicts:
	requirements/edx/github.txt

update ora2 hash to address (TNL-1350)

When two or more instances of Discussion XBlock were configured
with the same discussion target (Category/Subcategory),
only one of the blocks would be shown on the Course Discussion page.
This was the source of several bugs when trying to edit discussion threads.

This patch adds incrementing numbers to the title of each duplicate
subcategory when rendering the Course Discussion to make sure that
all of the threads are visible in Course Discussion.