This reverts commit 5db58c00.

Register CatalogIntegration model with the Django admin

Merging - @robrap FYI.
Bump XBlock version to 0.4.12

Update translations (autogenerated message)

Removing references to deleted module common.test.acceptance.pages.lm…

Tech Debt on Certificate generate panel

Fix branding api get_logo_url return value

Adding logging if course_id is not found in enrolled course modes.

Bump problem-builder on edx.org to edx-release 2.0.4

Release

Hotfix for tabs

Release Candidate: 2016-07-12

Account for settings.STATIC_URL in XBlock resource URLs when rewriting them.

ECOM-4681

rewriting them.

In PERF-341, we adjusted the static_replace middleware to try and
exclude static XBlock resource URLs from being interpreted as the marker
URLs used to signify course assets in course content.  Since they both
started with /static, this could, and did, cause issues where linking
directly to the assets of an XBlock within, say, one of its templates,
would lead to that link being rewritten and ultimately being incorrect.
The fix attempted to see if the link started with the prefix that all
static XBlock resource URLs start, and if so, it returned them
unmodified.

We incorrectly assumed that our testing captured all cases, and since
we're here, we know that this was wrong.  We weren't accounting for cases
when the URLs being generated had the STATIC_URL configuration value
prefixed -- https://example.com/static/xblock/.... -- and so our direct
check of seeing if such a URL started with "/static/xblock" would always
fail, leading to the erroneous rewriting and nonsensical output.

This fix checks if the link either starts with the prefix OR if it
starts with the STATIC_URL value and contains the prefix overall.  There
is a small overlap between the STATIC_URL and the prefix we check for,
so an inconsistency could arise down the line if we changed our
STATIC_URL to use a difference base directory, but our tests will at
least catch the issue now.

Add flag allow toggle logistration footer

small fix to typo in activation email

AC-517 fixes `color-contrast` ignores

Safelint violation count

Mark test for skipping SOL-1811

Add ConfigurationModel governing integration with the catalog service.

AC-486 updating tabbed_view to use proper accessibility rules

Fixes mobile app footer link styles