Merge branch 'master' of github.com:pretix/pretix

This commit is contained in:
Raphael Michel
2015-08-20 21:53:51 +02:00
3 changed files with 6 additions and 6 deletions

View File

@@ -10,7 +10,10 @@ Reinventing ticket presales, one bit at a time.
Project status Project status
-------------- --------------
We are really working on it, but it will take a while. Currently, this is as unstable as it can be. Everything can change daily. Try it, hack on it, write pull requests, write documentation, translate it but don't use it and don't put data in it. The basic features are present and sufficiently stable. pretix has been in use for one event and
sold a few hundred tickets so far. However, many features are missing and the admin UI is far from
being complete, so we **do not recommend** production use yet.
Maintainer Maintainer
---------- ----------

View File

@@ -153,7 +153,8 @@ class EventSettingsForm(SettingsForm):
mail_prefix = forms.CharField( mail_prefix = forms.CharField(
label=_("Subject prefix"), label=_("Subject prefix"),
help_text=_("This will be prepended to the subject of all outgoing emails. This could be a short form of " help_text=_("This will be prepended to the subject of all outgoing emails. This could be a short form of "
"your event name.") "your event name."),
required=False
) )
mail_from = forms.EmailField( mail_from = forms.EmailField(
label=_("Sender address"), label=_("Sender address"),

View File

@@ -232,7 +232,3 @@ class ImportView(EventPermissionRequiredMixin, TemplateView):
row['class'] = 'warning' row['class'] = 'warning'
row['message'] = _('Order has been refunded') row['message'] = _('Order has been refunded')
return data return data
@method_decorator(sensitive_post_parameters)
def dispatch(self, *args, **kwargs):
return super().dispatch(*args, **kwargs)