diff --git a/src/pretix/base/migrations/0010_auto_20150218_2048.py b/src/pretix/base/migrations/0010_auto_20150218_2048.py new file mode 100644 index 000000000..2c60cbf95 --- /dev/null +++ b/src/pretix/base/migrations/0010_auto_20150218_2048.py @@ -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), + ), + ] diff --git a/src/pretix/settings.py b/src/pretix/settings.py index 70f81cc97..dbadc08d9 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -42,7 +42,7 @@ INSTALLED_APPS = ( 'pretix.presale', 'compressor', 'bootstrap3', - 'debug_toolbar.apps.DebugToolbarConfig', + # 'debug_toolbar.apps.DebugToolbarConfig', 'djangoformsetjs', 'pretix.plugins.testdummy', 'pretix.plugins.timerestriction', @@ -54,7 +54,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', - 'debug_toolbar.middleware.DebugToolbarMiddleware', + # 'debug_toolbar.middleware.DebugToolbarMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'pretix.control.middleware.PermissionMiddleware', diff --git a/src/pretix/urls.py b/src/pretix/urls.py index 5a67db51d..936fc6928 100644 --- a/src/pretix/urls.py +++ b/src/pretix/urls.py @@ -14,10 +14,11 @@ urlpatterns = patterns('', ) if settings.DEBUG: - import debug_toolbar - urlpatterns += patterns('', - url(r'^__debug__/', include(debug_toolbar.urls)), - ) + pass + # import debug_toolbar + # urlpatterns += patterns('', + # url(r'^__debug__/', include(debug_toolbar.urls)), + # ) urlpatterns += patterns('', url(r'', include(pretix.presale.urls, namespace='presale')) diff --git a/src/requirements.txt b/src/requirements.txt index 5aa4f7824..327daf49c 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,5 +1,5 @@ # Functional requirements -Django==1.7.3 +Django==1.8a1 pytz django-bootstrap3 -e git+https://github.com/pretix/django-formset-js.git@master#egg=django-formset-js