Merge branch 'master' into github-allauth

Conflicts:
	kuma/users/providers/github/urls.py
	settings.py

.travis.yml

@@ -37,7 +37,7 @@ before_script:
     - mysql -e 'create database kuma;'
 
 script:
-    - coverage run --include=`pwd`/kuma/*,`pwd`/apps/* manage.py test --noinput -v2 actioncounters contentflagging dashboards kuma.demos devmo kpi landing search kuma.users wiki kuma.events
+    - coverage run --include=`pwd`/kuma/*,`pwd`/apps/* manage.py test --noinput -v2 actioncounters contentflagging dashboards kuma.demos devmo kpi landing search kuma.users kuma.wiki kuma.events
 
 after_success:
     - coveralls

apps/authkeys/urls.py

@@ -2,7 +2,7 @@
 
 urlpatterns = patterns('authkeys.views',
     url(r'^$', 'list', name='authkeys.list'),
-    url(r'^new$', 'new', name='authkeys.new'),
-    url(r'^(?P<pk>\d+)/history$', 'history', name='authkeys.history'),
-    url(r'^(?P<pk>\d+)/delete$', 'delete', name='authkeys.delete'),
+    url(r'^/new$', 'new', name='authkeys.new'),
+    url(r'^/(?P<pk>\d+)/history$', 'history', name='authkeys.history'),
+    url(r'^/(?P<pk>\d+)/delete$', 'delete', name='authkeys.delete'),
 )

apps/contentflagging/tests.py

@@ -21,11 +21,10 @@
 
 from sumo.urlresolvers import reverse
 
+from devmo.tests import LocalizingClient
 from kuma.demos.models import Submission
 from kuma.demos.tests.test_models import save_valid_submission
-from devmo.tests import LocalizingClient
-from wiki.models import Document
-
+from kuma.wiki.models import Document
 from .models import ContentFlag
 from .utils import get_ip, get_unique
 

apps/dashboards/views.py

@@ -1,17 +1,16 @@
-import json
 import datetime
+import json
 
 from django.contrib.auth.models import User
 from django.http import HttpResponse
 from django.shortcuts import render
 from django.views.decorators.http import require_GET
 
-from sumo.utils import paginate
-
-from wiki.models import Document, Revision
-
-from dashboards.forms import RevisionDashboardForm
-
+from kuma.users.helpers import ban_link
+from kuma.wiki.models import Document, Revision
+from sumo.urlresolvers import reverse
+from sumo.utils import paginate, smart_int
+from .forms import RevisionDashboardForm
 from . import PAGE_SIZE
 
 

apps/devmo/helpers.py

@@ -1,28 +1,29 @@
 import datetime
+import os
 import re
 import urllib
+
+import bleach
+import jinja2
+import pytz
 from urlobject import URLObject
-import os
 
 from django.conf import settings
+
+from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.cache import cache
 from django.template import defaultfilters
 from django.utils.encoding import force_text
 from django.utils.html import strip_tags
 from django.utils.safestring import mark_safe
 from django.contrib.messages.storage.base import LEVEL_TAGS
 
-import bleach
 from jingo import register
-import jinja2
-import pytz
 from soapbox.models import Message
 from statici18n.utils import get_filename
-from django.contrib.staticfiles.storage import staticfiles_storage
 
+from kuma.wiki.models import Document
 from sumo.urlresolvers import split_path, reverse
-from wiki.models import Document
-
 from .utils import entity_decode
 
 

apps/kpi/cron.py

@@ -3,7 +3,7 @@
 import cronjobs
 
 from kpi.models import Metric, MetricKind, L10N_METRIC_CODE
-from wiki.models import Document
+from kuma.wiki.models import Document
 
 
 @cronjobs.register

apps/kpi/tests/test_cron.py

@@ -6,8 +6,8 @@
 from kpi.cron import update_l10n_metric
 from kpi.models import Metric, L10N_METRIC_CODE
 from kpi.tests import metric_kind
+from kuma.wiki.tests import document, revision
 from sumo.tests import TestCase
-from wiki.tests import document, revision
 
 
 class CronJobTests(TestCase):

apps/landing/templates/landing/homepage.html

@@ -169,5 +169,8 @@ <h2><i aria-hidden="true" class="icon-smile-o"></i> {{ _('Help improve MDN') }}<
 
 {% block js %}
   {{ super() }}
-  {{ js('home', async=True) }}
+  <script>
+        // Create the demos slider
+        jQuery('.home-demos-list').owlCarousel({ lazyLoad: true }).css('height', 'auto');
+  </script>
 {% endblock %}

apps/landing/templates/landing/learn_html.html

@@ -28,11 +28,6 @@ <h1 class="page-title">{{ _('Learn HTML') }}</h1>
       <div id="intro-level" class="column-half learn-module">
         <h2>{{ _('Introductory Level') }}</h2>
         <ul class="link-list">
-          <li>
-            <h3 class="title"><a href="http://dev.opera.com/articles/view/12-the-basics-of-html/" rel="external">{{ _('The Basics of HTML') }}</a></h3>
-            <h4 class="source">Dev.Opera</h4>
-            <p>{{ _('What HTML is, what it does, its history in brief, and what the structure of an HTML document looks like. The articles that follow this one look at each individual part of HTML in much greater depth.') }}</p>
-          </li>
           <li>
             <h3 class="title"><a href="http://reference.sitepoint.com/html/page-structure" rel="external">{{ _('Basic Structure of a Web Page') }}</a></h3>
             <h4 class="source">SitePoint</h4>

apps/search/decorators.py

@@ -2,7 +2,7 @@
 from django.db.models.signals import pre_delete
 from elasticsearch.exceptions import ConnectionError
 
-from wiki.signals import render_done
+from kuma.wiki.signals import render_done
 
 from .signals import render_done_handler, pre_delete_handler
 

apps/search/models.py

@@ -15,7 +15,7 @@
 
 from sumo.urlresolvers import reverse
 
-from wiki.models import Document
+from kuma.wiki.models import Document
 from taggit_extras.managers import PrefetchTaggableManager
 
 from .decorators import register_mapping_type

apps/search/tests/test_indexes.py

@@ -1,9 +1,10 @@
 from nose.tools import eq_, ok_
 
 from django.conf import settings
+
 from elasticsearch.exceptions import RequestError
 
-from wiki.models import Document
+from kuma.wiki.models import Document
 from search.models import Index, DocumentType
 from search.tests import ElasticTestCase
 from search.index import get_indexing_es, get_indexes

apps/search/tests/test_tasks.py

@@ -1,10 +1,8 @@
 from nose.tools import eq_
 
-from search.tests import ElasticTestCase
-
-from wiki.tests import revision
-
+from kuma.wiki.tests import revision
 from search.models import DocumentType
+from search.tests import ElasticTestCase
 
 
 class TestLiveIndexing(ElasticTestCase):

apps/search/tests/test_types.py

@@ -1,10 +1,9 @@
 from nose.tools import ok_, eq_
 
+from kuma.wiki.models import Document
 from search.models import DocumentType
 from search.tests import ElasticTestCase
 
-from wiki.models import Document
-
 
 class DocumentTypeTests(ElasticTestCase):
     fixtures = ['test_users.json', 'wiki/documents.json']

apps/sumo/helpers.py

@@ -17,7 +17,6 @@
 from pytz import timezone
 from tower import ugettext_lazy as _lazy, ungettext
 
-import sumo.parser
 from sumo.urlresolvers import reverse
 
 
@@ -69,12 +68,6 @@ def urlparams(url_, hash=None, query_dict=None, **query):
     return new.geturl()
 
 
-@register.filter
-def wiki_to_html(wiki_markup, locale=settings.WIKI_DEFAULT_LANGUAGE):
-    """Wiki Markup -> HTML jinja2.Markup object"""
-    return jinja2.Markup(sumo.parser.wiki_to_html(wiki_markup, locale=locale))
-
-
 class Paginator(object):
 
     def __init__(self, pager):