forked from CGM_Public/pretix_original
Django 1.8b1 is coming this week, we are ready.
We are, django-debug-toolbar isn't.
This commit is contained in:
43
src/pretix/base/migrations/0010_auto_20150218_2048.py
Normal file
43
src/pretix/base/migrations/0010_auto_20150218_2048.py
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import models, migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('auth', '0005_alter_user_last_login_null'),
|
||||||
|
('pretixbase', '0009_eventsetting_organizersetting'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name='cartposition',
|
||||||
|
name='session',
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='user',
|
||||||
|
name='email',
|
||||||
|
field=models.EmailField(blank=True, max_length=254, db_index=True, verbose_name='E-mail', null=True),
|
||||||
|
),
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name='user',
|
||||||
|
name='groups',
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='user',
|
||||||
|
name='groups',
|
||||||
|
field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_query_name='user', related_name='user_set', to='auth.Group', verbose_name='groups'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='user',
|
||||||
|
name='last_login',
|
||||||
|
field=models.DateTimeField(blank=True, verbose_name='last login', null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='user',
|
||||||
|
name='username',
|
||||||
|
field=models.CharField(blank=True, max_length=120, help_text='Letters, digits and ./+/-/_ only.', null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -42,7 +42,7 @@ INSTALLED_APPS = (
|
|||||||
'pretix.presale',
|
'pretix.presale',
|
||||||
'compressor',
|
'compressor',
|
||||||
'bootstrap3',
|
'bootstrap3',
|
||||||
'debug_toolbar.apps.DebugToolbarConfig',
|
# 'debug_toolbar.apps.DebugToolbarConfig',
|
||||||
'djangoformsetjs',
|
'djangoformsetjs',
|
||||||
'pretix.plugins.testdummy',
|
'pretix.plugins.testdummy',
|
||||||
'pretix.plugins.timerestriction',
|
'pretix.plugins.timerestriction',
|
||||||
@@ -54,7 +54,7 @@ MIDDLEWARE_CLASSES = (
|
|||||||
'django.middleware.csrf.CsrfViewMiddleware',
|
'django.middleware.csrf.CsrfViewMiddleware',
|
||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
|
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
|
||||||
'debug_toolbar.middleware.DebugToolbarMiddleware',
|
# 'debug_toolbar.middleware.DebugToolbarMiddleware',
|
||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
'pretix.control.middleware.PermissionMiddleware',
|
'pretix.control.middleware.PermissionMiddleware',
|
||||||
|
|||||||
@@ -14,10 +14,11 @@ urlpatterns = patterns('',
|
|||||||
)
|
)
|
||||||
|
|
||||||
if settings.DEBUG:
|
if settings.DEBUG:
|
||||||
import debug_toolbar
|
pass
|
||||||
urlpatterns += patterns('',
|
# import debug_toolbar
|
||||||
url(r'^__debug__/', include(debug_toolbar.urls)),
|
# urlpatterns += patterns('',
|
||||||
)
|
# url(r'^__debug__/', include(debug_toolbar.urls)),
|
||||||
|
# )
|
||||||
|
|
||||||
urlpatterns += patterns('',
|
urlpatterns += patterns('',
|
||||||
url(r'', include(pretix.presale.urls, namespace='presale'))
|
url(r'', include(pretix.presale.urls, namespace='presale'))
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Functional requirements
|
# Functional requirements
|
||||||
Django==1.7.3
|
Django==1.8a1
|
||||||
pytz
|
pytz
|
||||||
django-bootstrap3
|
django-bootstrap3
|
||||||
-e git+https://github.com/pretix/django-formset-js.git@master#egg=django-formset-js
|
-e git+https://github.com/pretix/django-formset-js.git@master#egg=django-formset-js
|
||||||
|
|||||||
Reference in New Issue
Block a user