Merge branch 'develop'
This commit is contained in:
commit
4bcee79e8a
@ -407,7 +407,7 @@ form {
|
|||||||
padding: 8px 16px;
|
padding: 8px 16px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
||||||
.form-field {
|
.form-field:not(.hidden) {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
margin: 16px auto;
|
margin: 16px auto;
|
||||||
|
@ -1,43 +1,47 @@
|
|||||||
{
|
{
|
||||||
app: {
|
app: {
|
||||||
name: 'Example App',
|
name: 'Example App',
|
||||||
contact_email: 'contact@example.net'
|
contact_email: 'contact@example.net',
|
||||||
},
|
},
|
||||||
log_level: "DEV",
|
log_level: "DEV",
|
||||||
db_log_level: "ERROR",
|
db_log_level: "ERROR",
|
||||||
public_url: "http://localhost:4899",
|
public_url: "http://localhost:4899",
|
||||||
public_websocket_url: "ws://localhost:4899",
|
public_websocket_url: "ws://localhost:4899",
|
||||||
port: 4899,
|
port: 4899,
|
||||||
mysql: {
|
mysql: {
|
||||||
connectionLimit: 10,
|
connectionLimit: 10,
|
||||||
host: "localhost",
|
host: "localhost",
|
||||||
user: "root",
|
user: "root",
|
||||||
password: "",
|
password: "",
|
||||||
database: "example_app",
|
database: "example_app",
|
||||||
create_database_automatically: false
|
create_database_automatically: false,
|
||||||
},
|
},
|
||||||
redis: {
|
redis: {
|
||||||
host: "127.0.0.1",
|
host: "127.0.0.1",
|
||||||
port: 6379,
|
port: 6379,
|
||||||
prefix: 'example_app'
|
prefix: 'example_app',
|
||||||
},
|
},
|
||||||
session: {
|
session: {
|
||||||
cookie: {
|
cookie: {
|
||||||
secure: false
|
secure: false,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
mail: {
|
mail: {
|
||||||
host: "127.0.0.1",
|
host: "127.0.0.1",
|
||||||
port: "1025",
|
port: "1025",
|
||||||
secure: false,
|
secure: false,
|
||||||
username: "",
|
username: "",
|
||||||
password: "",
|
password: "",
|
||||||
allow_invalid_tls: true,
|
allow_invalid_tls: true,
|
||||||
from: 'contact@example.net',
|
from: 'contact@example.net',
|
||||||
from_name: 'Example App',
|
from_name: 'Example App',
|
||||||
},
|
},
|
||||||
view: {
|
view: {
|
||||||
cache: false
|
cache: false,
|
||||||
},
|
},
|
||||||
approval_mode: false,
|
auth: {
|
||||||
|
approval_mode: false,
|
||||||
|
// 30 days
|
||||||
|
name_change_wait_period: 2592000000,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
{
|
{
|
||||||
log_level: "DEBUG",
|
log_level: "DEBUG",
|
||||||
db_log_level: "ERROR",
|
db_log_level: "ERROR",
|
||||||
public_url: "https://watch-my.stream",
|
public_url: "https://watch-my.stream",
|
||||||
public_websocket_url: "wss://watch-my.stream",
|
public_websocket_url: "wss://watch-my.stream",
|
||||||
session: {
|
session: {
|
||||||
cookie: {
|
cookie: {
|
||||||
secure: true
|
secure: true,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
mail: {
|
mail: {
|
||||||
secure: true,
|
secure: true,
|
||||||
allow_invalid_tls: false
|
allow_invalid_tls: false,
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user