mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-04 06:06:19 +01:00
Fix registration.
Fix state assignment. Fix character ownership transfer. Disable non-staff passwords. Fix dashboard groups panel placement. Fix corpstats viewmodel retrieval.
This commit is contained in:
@@ -4,5 +4,5 @@ from __future__ import absolute_import, unicode_literals
|
||||
# Django starts so that shared_task will use this app.
|
||||
from .celeryapp import app as celery_app # noqa
|
||||
|
||||
__version__ = '1.15.0'
|
||||
__version__ = '1.16-dev'
|
||||
NAME = 'Alliance Auth v%s' % __version__
|
||||
|
||||
@@ -225,6 +225,7 @@ SITE_NAME = 'Alliance Auth'
|
||||
#################
|
||||
# EMAIL SETTINGS
|
||||
#################
|
||||
# DEFAULT_FROM_EMAIL - no-reply email address
|
||||
# DOMAIN - The Alliance Auth domain (or subdomain) address, starting with http://
|
||||
# EMAIL_HOST - SMTP Server URL
|
||||
# EMAIL_PORT - SMTP Server PORT
|
||||
@@ -232,6 +233,7 @@ SITE_NAME = 'Alliance Auth'
|
||||
# EMAIL_HOST_PASSWORD - Email Password
|
||||
# EMAIL_USE_TLS - Set to use TLS encryption
|
||||
#################
|
||||
DEFAULT_FROM_EMAIL = 'no-reply@example.com'
|
||||
DOMAIN = 'https://example.com'
|
||||
EMAIL_HOST = 'smtp.gmail.com'
|
||||
EMAIL_PORT = 587
|
||||
@@ -261,10 +263,12 @@ ESI_SSO_CALLBACK_URL = ''
|
||||
# LOGIN_REDIRECT_URL - default destination when logging in if no redirect specified
|
||||
# LOGOUT_REDIRECT_URL - destination after logging out
|
||||
# LOGIN_TOKEN_SCOPES - scopes required on new tokens when logging in. Cannot be blank.
|
||||
# ACCOUNT_ACTIVATION_DAYS - number of days email verification tokens are valid for
|
||||
##################
|
||||
LOGIN_REDIRECT_URL = 'authentication:dashboard'
|
||||
LOGOUT_REDIRECT_URL = 'authentication:dashboard'
|
||||
LOGIN_TOKEN_SCOPES = ['esi-characters.read_opportunities.v1']
|
||||
ACCOUNT_ACTIVATION_DAYS = 1
|
||||
|
||||
#####################
|
||||
# Alliance Market
|
||||
|
||||
@@ -4,6 +4,7 @@ from django.conf.urls.i18n import i18n_patterns
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.contrib import admin
|
||||
import authentication.urls
|
||||
from authentication import hmac_urls
|
||||
import authentication.views
|
||||
import services.views
|
||||
import groupmanagement.views
|
||||
@@ -19,6 +20,7 @@ import esi.urls
|
||||
import permissions_tool.urls
|
||||
from alliance_auth import NAME
|
||||
from alliance_auth.hooks import get_hooks
|
||||
from django.views.generic.base import TemplateView
|
||||
|
||||
admin.site.site_header = NAME
|
||||
|
||||
@@ -30,6 +32,8 @@ urlpatterns = [
|
||||
|
||||
# Authentication
|
||||
url(r'', include(authentication.urls, namespace='authentication')),
|
||||
url(r'^account/login/$', TemplateView.as_view(template_name='public/login.html'), name='auth_login_user'),
|
||||
url(r'account/', include(hmac_urls)),
|
||||
|
||||
# Admin urls
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
|
||||
Reference in New Issue
Block a user