Unverified Commit 47042428 authored by Thom Wiggers's avatar Thom Wiggers

Merge branch 'master' into release/1.0.0

parents b6b8b612 85a6f424
......@@ -63,8 +63,8 @@ Make sure to use British English.
To create translations for your app:
1. `./manage.py makemessages <appname>`
2. Dit zou bestanden onder `<appnaam>/locale/` aangemaakt of bijgewerkt moeten hebben.
3. Gebruik poedit (of je favoriete tool -- liever niet een simpele texteditor want die kan niet met alle subtiliteiten omgaan) om de vertaling te fixen.
2. This will create or update the files under `<appname>/locale/`.
3. Use poedit (or your favourite tool -- please do not use a plain text editor since those cannot handle all the subtleties) to fix the translations.
4. `./manage.py compilemessages`
Docker
......@@ -80,4 +80,4 @@ Step 1. may take a while since `docker-compose` needs to retrieve all dependenci
and build the Docker images. Step 2. creates the necessary tables and step 3.
creates a superuser, as the command implies.
After step 3. you can access the Thalia website locally through http://localhost:8000/
\ No newline at end of file
After step 3. you can access the Thalia website locally through http://localhost:8000/
......@@ -207,6 +207,8 @@ STATIC_PRECOMPILER_LIST_FILES = True
# Default FROM email
DEFAULT_FROM_EMAIL = 'noreply@thalia.nu'
SERVER_EMAIL = DEFAULT_FROM_EMAIL
# Newsletter settings
NEWSLETTER_FROM_ADDRESS = 'nieuwsbrief@thalia.nu'
......
......@@ -98,5 +98,7 @@ urlpatterns = [
url(r'^tinymce/', include('tinymce.urls')),
# Javascript translation catalog
url(r'jsi18n/$', JavaScriptCatalog.as_view(), name='javascript-catalog'),
# XXX
url(r'crash/$', views.crash),
] + static(settings.MEDIA_URL + 'public/',
document_root=os.path.join(settings.MEDIA_ROOT, 'public'))
from django.conf import settings
from django.contrib.auth import authenticate
from django.contrib.admin.views.decorators import staff_member_required
from django.http import (HttpResponseBadRequest,
HttpResponseForbidden, JsonResponse)
from django.utils import timezone
......@@ -43,3 +44,8 @@ def wiki_login(request):
return JsonResponse({'status': 'error',
'msg': 'Authentication Failed'},
status_code=403)
@staff_member_required
def crash(request):
raise Exception("Test exception")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment