Merge commit 'bea6c60'
Accidently committed to master.
This commit is contained in:
		@@ -41,7 +41,8 @@ INSTALLED_APPS = [
 | 
				
			|||||||
    'django.contrib.sessions',
 | 
					    'django.contrib.sessions',
 | 
				
			||||||
    'django.contrib.messages',
 | 
					    'django.contrib.messages',
 | 
				
			||||||
    'django.contrib.staticfiles',
 | 
					    'django.contrib.staticfiles',
 | 
				
			||||||
    'django_thumbs'
 | 
					    'django_thumbs',
 | 
				
			||||||
 | 
					    'invitations'
 | 
				
			||||||
]
 | 
					]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MIDDLEWARE = [
 | 
					MIDDLEWARE = [
 | 
				
			||||||
@@ -136,3 +137,10 @@ AUTH_USER_MODEL = 'lostplaces_app.Explorer'
 | 
				
			|||||||
# Templates to use for authentication
 | 
					# Templates to use for authentication
 | 
				
			||||||
LOGIN_REDIRECT_URL = 'home'
 | 
					LOGIN_REDIRECT_URL = 'home'
 | 
				
			||||||
LOGOUT_REDIRECT_URL = 'home'
 | 
					LOGOUT_REDIRECT_URL = 'home'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# User invitation settings
 | 
				
			||||||
 | 
					ACCOUNT_INVITATION_DAYS = 14
 | 
				
			||||||
 | 
					ACCOUNT_ACTIVATION_DAYS = 14
 | 
				
			||||||
 | 
					INVITATIONS_PER_USER = 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					INVITE_MODE = True
 | 
				
			||||||
@@ -1,4 +1,5 @@
 | 
				
			|||||||
from django.urls import path
 | 
					from django.urls import path, include
 | 
				
			||||||
 | 
					from django.conf.urls import url
 | 
				
			||||||
from .views import (
 | 
					from .views import (
 | 
				
			||||||
    hello_world, 
 | 
					    hello_world, 
 | 
				
			||||||
    VoucherVerify,
 | 
					    VoucherVerify,
 | 
				
			||||||
@@ -17,5 +18,6 @@ urlpatterns = [
 | 
				
			|||||||
    path('place/<int:pk>/', place_detail_view, name='place_detail'),
 | 
					    path('place/<int:pk>/', place_detail_view, name='place_detail'),
 | 
				
			||||||
    path('place/create/', PlaceCreateView.as_view(), name='place_create'),
 | 
					    path('place/create/', PlaceCreateView.as_view(), name='place_create'),
 | 
				
			||||||
    path('place/update/<int:pk>/', PlaceUpdateView.as_view(), name='place_edit'),
 | 
					    path('place/update/<int:pk>/', PlaceUpdateView.as_view(), name='place_edit'),
 | 
				
			||||||
    path('place/', place_list_view, name='place_list')
 | 
					    path('place/', place_list_view, name='place_list'),
 | 
				
			||||||
 | 
					    (r'^accounts/', include('invitation.urls'))
 | 
				
			||||||
]
 | 
					]
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user