Merge branch 'master' into account

gallery/settings.py

@@ -28,6 +28,9 @@ ALLOWED_HOSTS = ['*']
 
 if DEBUG:
     INTERNAL_IPS = ('localhost',)
+    DEBUG_TOOLBAR_CONFIG = {
+        'SHOW_TOOLBAR_CALLBACK': (lambda x: True),
+    }
 
 # SMTP server/relay to send error emails (to ADMINS) from
 ADMINS = [('c0de', 'c0de@c0defox.es')]
@@ -53,6 +56,7 @@ INSTALLED_APPS = [
 ]
 if DEBUG:
     INSTALLED_APPS += [
+        'debug_toolbar',
         'debug_panel'
     ]
 

gallery/urls.py

@@ -15,8 +15,13 @@ Including another URLconf
 """
 from django.conf.urls import include, url
 from django.contrib import admin
+from django.conf import settings
 
 urlpatterns = [
     url(r'^account/', include('account.urls')),
     url(r'^admin/', admin.site.urls),
 ]
+if settings.DEBUG:
+    urlpatterns += [
+        url(r'^__debug__/', include(__import__('debug_toolbar').urls)),
+    ]