Merge pull request #2170 from diox/mv-zadmin

Moved apps/zadmin/ to mkt/zadmin/ (bug 1021207)
mozilla · Jun 11, 2014 · 4634773 · 4634773
2 parents 68c3c3a + 2cf0fd1
commit 4634773
Show file tree

Hide file tree

Showing 39 changed files with 683 additions and 1,112 deletions.
diff --git a/apps/amo/management/commands/install_landfill.py b/apps/amo/management/commands/install_landfill.py
@@ -11,7 +11,7 @@
 from django.conf import settings
 from django.core.management.base import BaseCommand
 
-from zadmin.models import Config
+from mkt.zadmin.models import Config
 
 
 class Command(BaseCommand):

diff --git a/apps/amo/tests/test_middleware.py b/apps/amo/tests/test_middleware.py
@@ -10,7 +10,7 @@
 import amo.tests
 from amo.middleware import NoVarySessionMiddleware
 from amo.urlresolvers import reverse
-from zadmin.models import Config, _config_cache
+from mkt.zadmin.models import Config, _config_cache
 
 
 class TestMiddleware(amo.tests.TestCase):

diff --git a/apps/zadmin/__init__.py b/apps/zadmin/__init__.py
diff --git a/apps/zadmin/models.py b/apps/zadmin/models.py
diff --git a/apps/zadmin/templates/zadmin/addon-search.html b/apps/zadmin/templates/zadmin/addon-search.html
diff --git a/apps/zadmin/templates/zadmin/addon_manage.html b/apps/zadmin/templates/zadmin/addon_manage.html
diff --git a/apps/zadmin/tests/__init__.py b/apps/zadmin/tests/__init__.py