Merge branch 'develop'

This commit is contained in:
Alice Gaudon 2020-06-27 18:18:28 +02:00
commit 524f105ef8
5 changed files with 19 additions and 5 deletions

View File

@ -23,4 +23,14 @@ export default Object.assign(require("wms-core/config/default").default, {
default_file_ttl: 30, // 30 seconds default_file_ttl: 30, // 30 seconds
max_upload_size: 1, // MB max_upload_size: 1, // MB
approval_mode: false, approval_mode: false,
mail: {
host: "127.0.0.1",
port: "1025",
secure: false,
username: "",
password: "",
allow_invalid_tls: true,
from: 'contact@ily.li',
from_name: 'ily.li',
},
}); });

View File

@ -17,4 +17,8 @@ export default Object.assign(require("wms-core/config/production").default, {
default_file_ttl: 30 * 24 * 3600, // 30 days default_file_ttl: 30 * 24 * 3600, // 30 days
max_upload_size: 8192, // MB max_upload_size: 8192, // MB
approval_mode: true, approval_mode: true,
mail: {
secure: true,
allow_invalid_tls: false
},
}); });

View File

@ -1,6 +1,6 @@
{ {
"name": "ily.li", "name": "ily.li",
"version": "0.3.0", "version": "0.3.1",
"description": "Self-hosted file pusher", "description": "Self-hosted file pusher",
"repository": "git@gitlab.com:ArisuOngaku/ily.li.git", "repository": "git@gitlab.com:ArisuOngaku/ily.li.git",
"author": "Alice Gaudon <alice@gaudon.pro>", "author": "Alice Gaudon <alice@gaudon.pro>",

View File

@ -2,7 +2,7 @@
{% import 'macros.njk' as macros %} {% import 'macros.njk' as macros %}
{% set title = 'Authentication / Registration' %} {% set title = 'Authentication / Registration' %}
{% set decription = 'Join Watch My Stream and power up your streams!' %} {% set decription = 'Join ' + app.name + ' and share your files!' %}
{% set h1 = 'Authentication and registration' %} {% set h1 = 'Authentication and registration' %}
{% block body %} {% block body %}

View File

@ -9825,9 +9825,9 @@ widest-line@^3.1.0:
string-width "^4.0.0" string-width "^4.0.0"
wms-core@^0: wms-core@^0:
version "0.10.16" version "0.10.18"
resolved "https://registry.toot.party/wms-core/-/wms-core-0.10.16.tgz#55dc66d6443b2cab82f0bfb7db9673d4ab07c45e" resolved "https://registry.toot.party/wms-core/-/wms-core-0.10.18.tgz#450bf5be19f1a5872230199b04353169e3cfe2aa"
integrity sha512-NY4PKzcf9rEWmYznTR9qI+CofW7Bfut+djCBQ/GBVzEI/tW9RAudtLhfYrYvHJYPOyLWMdoP7KNxROyt37TzLg== integrity sha512-x4+FgnfovJHLpAKYKmh5+rM9Zovklya8mZC+KnrQ65y2v3vw3i9hDRjXeums5OvyQsBA7X4OObEffTbClLNCTQ==
dependencies: dependencies:
"@types/express" "^4.17.6" "@types/express" "^4.17.6"
"@types/express-session" "^1.17.0" "@types/express-session" "^1.17.0"