From faa728aacb3b9472ab0844215fc97560b46a3f48 Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Tue, 30 Mar 2021 14:27:03 +0200 Subject: [PATCH 1/4] layout.scss: allow .form-field to be hidden with .hidden --- assets/sass/layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/sass/layout.scss b/assets/sass/layout.scss index 66e8363..3d791fd 100644 --- a/assets/sass/layout.scss +++ b/assets/sass/layout.scss @@ -398,7 +398,7 @@ form { padding: 8px 16px; text-align: center; - .form-field { + .form-field:not(.hidden) { display: flex; flex-direction: column; margin: 16px auto; From 0b07ff68d95009415d442d737348e5a2e349328d Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Tue, 30 Mar 2021 16:42:54 +0200 Subject: [PATCH 2/4] Remove forgotten debug log --- src/migrations/ReplaceTtlWithExpiresAtFilesTable.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/migrations/ReplaceTtlWithExpiresAtFilesTable.ts b/src/migrations/ReplaceTtlWithExpiresAtFilesTable.ts index fd0be5e..722d853 100644 --- a/src/migrations/ReplaceTtlWithExpiresAtFilesTable.ts +++ b/src/migrations/ReplaceTtlWithExpiresAtFilesTable.ts @@ -1,6 +1,5 @@ import Migration from "swaf/db/Migration"; import FileModel from "../models/FileModel"; -import {logger} from "swaf/Logger"; export default class ReplaceTtlWithExpiresAtFilesTable extends Migration { public async install(): Promise { @@ -9,7 +8,6 @@ export default class ReplaceTtlWithExpiresAtFilesTable extends Migration { const files = await FileModel.select().get(); for (const file of files) { - logger.debug(file); if (file.created_at && typeof file.ttl === 'number' && file.ttl > 0) { file.expires_at = new Date(file.created_at.getTime() + file.ttl * 1000); } From d223c9c77f1b6e6f3b5da0cf2c6bb518af80ccd6 Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Tue, 30 Mar 2021 16:56:35 +0200 Subject: [PATCH 3/4] Update config to new swaf version --- config/default.json5 | 86 +++++++++++++++++++++-------------------- config/production.json5 | 26 ++++++------- 2 files changed, 58 insertions(+), 54 deletions(-) diff --git a/config/default.json5 b/config/default.json5 index e0c6b9b..0afc385 100644 --- a/config/default.json5 +++ b/config/default.json5 @@ -1,43 +1,47 @@ { - app: { - name: 'Example App', - contact_email: 'contact@example.net' - }, - log_level: "DEV", - db_log_level: "ERROR", - public_url: "http://localhost:4899", - public_websocket_url: "ws://localhost:4899", - port: 4899, - mysql: { - connectionLimit: 10, - host: "localhost", - user: "root", - password: "", - database: "example_app", - create_database_automatically: false - }, - redis: { - host: "127.0.0.1", - port: 6379, - prefix: 'example_app' - }, - session: { - cookie: { - secure: false - } - }, - mail: { - host: "127.0.0.1", - port: "1025", - secure: false, - username: "", - password: "", - allow_invalid_tls: true, - from: 'contact@example.net', - from_name: 'Example App', - }, - view: { - cache: false - }, - approval_mode: false, + app: { + name: 'Example App', + contact_email: 'contact@example.net', + }, + log_level: "DEV", + db_log_level: "ERROR", + public_url: "http://localhost:4899", + public_websocket_url: "ws://localhost:4899", + port: 4899, + mysql: { + connectionLimit: 10, + host: "localhost", + user: "root", + password: "", + database: "example_app", + create_database_automatically: false, + }, + redis: { + host: "127.0.0.1", + port: 6379, + prefix: 'example_app', + }, + session: { + cookie: { + secure: false, + }, + }, + mail: { + host: "127.0.0.1", + port: "1025", + secure: false, + username: "", + password: "", + allow_invalid_tls: true, + from: 'contact@example.net', + from_name: 'Example App', + }, + view: { + cache: false, + }, + auth: { + approval_mode: false, + // 30 days + name_change_wait_period: 2592000000, + }, } diff --git a/config/production.json5 b/config/production.json5 index 6993e0e..725329b 100644 --- a/config/production.json5 +++ b/config/production.json5 @@ -1,15 +1,15 @@ { - log_level: "DEBUG", - db_log_level: "ERROR", - public_url: "https://watch-my.stream", - public_websocket_url: "wss://watch-my.stream", - session: { - cookie: { - secure: true - } - }, - mail: { - secure: true, - allow_invalid_tls: false - } + log_level: "DEBUG", + db_log_level: "ERROR", + public_url: "https://watch-my.stream", + public_websocket_url: "wss://watch-my.stream", + session: { + cookie: { + secure: true, + }, + }, + mail: { + secure: true, + allow_invalid_tls: false, + }, } From 8555a3597004f9da507ff103775545b105b8ca89 Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Tue, 30 Mar 2021 17:03:24 +0200 Subject: [PATCH 4/4] Version 1.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 553d275..7f419aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ily.li", - "version": "1.0.0", + "version": "1.0.1", "description": "Self-hosted file pusher", "repository": "https://eternae.ink/arisu/ily.li", "author": "Alice Gaudon ",