Bläddra i källkod

password recovery integrated

master
Dirk Alders 1 månad sedan
förälder
incheckning
eef11cc5f3
4 ändrade filer med 11 tillägg och 8 borttagningar
  1. 8
    6
      config_example/config.py
  2. 1
    0
      piki/settings.py
  3. 1
    1
      themes
  4. 1
    1
      users

+ 8
- 6
config_example/config.py Visa fil

@@ -9,6 +9,12 @@ STARTPAGE = "startpage"
9 9
 # Activate content management system (view)
10 10
 # CMS_MODE = True
11 11
 
12
+#
13
+# Themes library
14
+#
15
+# This defines the default theme, if no theme is set in the django parameters
16
+DEFAULT_THEME = 'clear-teal'
17
+
12 18
 #
13 19
 # Users library
14 20
 #
@@ -19,6 +25,8 @@ USERS_SELF_REGISTRATION = False
19 25
 USERS_MAIL_VALIDATION = True
20 26
 # This enables or disables the account activation by an admin after self registration
21 27
 USERS_ADMIN_ACTIVATION = True
28
+# The timeout for password recovery and mail validation tokens send via email
29
+PASSWORD_RESET_TIMEOUT = 60 * 60 * 3    # 3 hours
22 30
 
23 31
 #
24 32
 # Django mail / smtp settings
@@ -44,12 +52,6 @@ USERS_ADMIN_ACTIVATION = True
44 52
 # Define an ssl certificate
45 53
 # EMAIL_SSL_CERTFILE =
46 54
 
47
-#
48
-# Themes library
49
-#
50
-# This defines the default theme, if no theme is set in the django parameters
51
-DEFAULT_THEME = 'clear-teal'
52
-
53 55
 #
54 56
 # Django
55 57
 #

+ 1
- 0
piki/settings.py Visa fil

@@ -165,6 +165,7 @@ USER_CONFIG_DEFAULTS = {
165 165
     'ALLOWED_HOSTS': ['127.0.0.1', 'localhost', ],
166 166
     'CSRF_TRUSTED_ORIGINS': [],
167 167
     'ADMINS': [],
168
+    'PASSWORD_RESET_TIMEOUT': 60 * 60 * 3,
168 169
     #
169 170
     'EMAIL_HOST': None,
170 171
     'EMAIL_PORT': None,

+ 1
- 1
themes

@@ -1 +1 @@
1
-Subproject commit 47e9f3104c5016ef9405c90ee5dfca6e638e7d82
1
+Subproject commit b7673fa82763830009c7dc95ecf93d7e96f692f9

+ 1
- 1
users

@@ -1 +1 @@
1
-Subproject commit f31771b5882af0468ae077ebb8246eead0895fae
1
+Subproject commit 12526f44d736b360a2c92a46eabed1c455e1b4fa

Laddar…
Avbryt
Spara