Adam/add defunct states for cart

add retire method to order class

In LMS, load OVA JS only in four OVA templates with requireJS. [TNL-693-outdated]

Unpurchased items in the shoppingcart should be removed if the enrollment period has closed

Merge pull request #6114 from edx/waheed/tnl892-fix-css-background-image-for-important-visual-indicator

Added IMG tag instead of css background property for important visual indicator.

TNL-892

Remove items from the shopping cart if they are for a course whose course enrollment window has closed

changed the url name to verify_cart and change the color of the message in the shopping cart

Cohorted courseware

Revert "Jarv/config refactor wip"

Pin django-cas to hash

Jarv/config refactor wip

Make changes to the Mongo modulestore format for asset metadata.

https://openedx.atlassian.net/browse/PLAT-301

Update translations (autogenerated message)

Add email opt in to old login and register pages

Support unicode ANALYTICS_DASHBOARD_NAME

Don't allow voting while the thread is closed

I open this pull to support unicode ANALYTICS_DASHBOARD_NAME

Clytwynec/dont fail diff quality for todo

fix export for openassessment drafts (PLAT-249)

avoid errors when forward-migrating course_groups after south conversion

Modulestore Support for Content libraries (Part of SOL-1, SOL-2, SOL-3)

Move the asset types under a top-level 'assets' dict to allow for
future arbitrary asset types.
Change 'basename' to 'pathname', since the attr is for storing the path.

Create helper function to remove duplicate code

Fix help modal css selector

This repetitive code is especially pronounced in Stanford's fork, where
we have extended the About page to include several additional fields.

This pays down some technical debt by refactoring into a shared helper.

Revert enable login/registration

JIRA: TNL-937

Moved has_course_access from CMS to student.auth (common)

Revert "If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page."

This reverts commit f40447b3.

Conflicts:
	lms/urls.py

Revert "Add support for external auth on the combined login/registration page"

This reverts commit 98875339.

Conflicts:
	lms/templates/courseware/mktg_course_about.html
	lms/urls.py

TNL-670

JIRA: TNL-710

IMPORTANT: this commit converts the course_groups
package to using migrations.  When deploying to an
existing openedx instance, migration 0001 may fail
with an error indicating that the CourseUserGroup
table already exists.  If this happens, running
the 0001 migration first, with the --fake option,
is recommended.  After performing this step,
remaining migrations should work as expected.

TNL-649