From 8c757019e28e5ec32ede9b1c454d35368e02d878 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 9 Apr 2019 11:50:13 +0200 Subject: [PATCH 1/4] work around adblock plus removing our self-hosted twitter icon --- customize.dist/images/{twitter.svg => twiitter.svg} | 0 customize.dist/pages/contact.js | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename customize.dist/images/{twitter.svg => twiitter.svg} (100%) diff --git a/customize.dist/images/twitter.svg b/customize.dist/images/twiitter.svg similarity index 100% rename from customize.dist/images/twitter.svg rename to customize.dist/images/twiitter.svg diff --git a/customize.dist/pages/contact.js b/customize.dist/pages/contact.js index aea511fb4..20e927273 100644 --- a/customize.dist/pages/contact.js +++ b/customize.dist/pages/contact.js @@ -38,7 +38,8 @@ define([ h('a.card', {href : "https://twitter.com/cryptpad"}, h('div.card-body', h('p', [ - h('img', {src: '/customize/images/twitter.svg'}), + // this is not a typo. adblock plus blocks images with src *twitter* apparently + h('img', {src: '/customize/images/twiitter.svg'}), 'Twitter' ]) ) From b3e0f9e886f7a020b34c9ec1c60ed137daba564c Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 9 Apr 2019 11:57:33 +0200 Subject: [PATCH 2/4] fix use before definition --- lib/log.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/log.js b/lib/log.js index 941150530..31e324075 100644 --- a/lib/log.js +++ b/lib/log.js @@ -79,6 +79,9 @@ Logger.create = function (config, cb) { config.logLevel = 'info'; } + var date = new Date(); + var launchTime = ('' + date.getUTCFullYear()).slice(-2) + date.toISOString(); + var ctx = { channelName: launchTime, logFeedback: Boolean(config.logFeedback), @@ -90,9 +93,6 @@ Logger.create = function (config, cb) { return void cb(Object.freeze(createMethods(ctx))); } - var date = new Date(); - var launchTime = ('' + date.getUTCFullYear()).slice(-2) + date.toISOString(); - Store.create({ filePath: config.logPath, }, function (store) { From 0bd14bfcbe4ce565f14d8eb8622ac073fe467038 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 9 Apr 2019 14:29:02 +0200 Subject: [PATCH 3/4] fix logging to stdout and document logging configuration --- config/config.example.js | 26 +++++++++++++++++++++++--- lib/log.js | 1 + 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/config/config.example.js b/config/config.example.js index 1fae5ae9c..6aaec1426 100644 --- a/config/config.example.js +++ b/config/config.example.js @@ -277,6 +277,11 @@ module.exports = { */ blobStagingPath: './blobstage', + /* CryptPad supports logging events directly to the disk in a 'logs' directory + * Set its location here, or set it to false if you'd rather not log + */ + logPath: './data/logs', + /* ===================== * Debugging * ===================== */ @@ -286,10 +291,18 @@ module.exports = { */ logToStdout: false, - /* CryptPad supports verbose logging - * (false by default) + /* CryptPad can be configured to log more or less + * the various settings are listed below by order of importance + * + * silly, debug, verbose, feedback, info, warn, error + * + * Choose the least important level of logging you wish to see. + * For example, a 'silly' logLevel will display everything, + * while 'info' will display 'info', 'warn', and 'error' logs + * + * This will affect both logging to the console and the disk. */ - verbose: false, + logLevel: 'info', /* clients can use the /settings/ app to opt out of usage feedback * which informs the server of things like how much each app is being @@ -297,6 +310,9 @@ module.exports = { * the client's browser. The intent is to provide feedback to the admin * such that the service can be improved. Enable this with `true` * and ignore feedback with `false` or by commenting the attribute + * + * You will need to set your logLevel to include 'feedback'. Set this + * to false if you'd like to exclude feedback from your logs. */ logFeedback: false, @@ -336,4 +352,8 @@ module.exports = { */ rpc: './rpc.js', + /* CryptPad supports verbose logging + * (false by default) + */ + verbose: false, }; diff --git a/lib/log.js b/lib/log.js index 31e324075..f8aad4978 100644 --- a/lib/log.js +++ b/lib/log.js @@ -86,6 +86,7 @@ Logger.create = function (config, cb) { channelName: launchTime, logFeedback: Boolean(config.logFeedback), logLevel: config.logLevel, + logToStdout: config.logToStdout, }; if (!config.logPath) { From 9c4ae6155045c281c53ce10fb3d1a8e33fb416c8 Mon Sep 17 00:00:00 2001 From: Weblate Date: Tue, 9 Apr 2019 12:42:54 +0000 Subject: [PATCH 4/4] Translated using Weblate (German) Currently translated at 100.0% (947 of 947 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ --- www/common/translations/messages.de.json | 32 +++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index ea82786f9..0abb1f49e 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -1011,5 +1011,35 @@ "mdToolbar_toc": "Inhaltsverzeichnis", "markdown_toc": "Inhalt", "fm_expirablePad": "Dieses Pad läuft am {0} aus", - "button_newsheet": "Neue Tabelle" + "button_newsheet": "Neue Tabelle", + "admin_authError": "Nur Administratoren können auf diese Seite zugreifen", + "admin_cat_general": "Allgemein", + "admin_cat_stats": "Statistiken", + "adminPage": "Administration", + "admin_activeSessionsTitle": "Aktive Verbindungen", + "admin_activeSessionsHint": "Anzahl aktiver Websocket-Verbindungen (und verbundener IP-Adressen)", + "admin_activePadsTitle": "Aktive Pads", + "admin_activePadsHint": "Anzahl der Dokumente, die gerade angesehen oder bearbeitet werden", + "admin_registeredTitle": "Registrierte Nutzer", + "admin_registeredHint": "Anzahl der auf deiner Instanz registrierten Nutzer", + "admin_updateLimitTitle": "Nutzer-Quotas aktualisieren", + "admin_updateLimitHint": "Das Erzwingen einer Aktualisierung der Speicherbegrenzungen für Nutzer ist jederzeit möglich, aber nur im Fehlerfall notwendig", + "admin_updateLimitButton": "Quotas aktualisieren", + "admin_updateLimitDone": "Update erfolgreich abgeschlossen", + "admin_flushCacheTitle": "HTTP-Cache leeren", + "admin_flushCacheHint": "Benutzer zwingen, die aktuellen Inhalte vom Server herunterzuladen", + "admin_flushCacheButton": "Cache leeren", + "admin_flushCacheDone": "Cache erfolgreich geleert", + "footer_product": "Produkt", + "footer_team": "Das Team", + "footer_donate": "Spenden", + "footer_legal": "Rechtliches", + "footer_tos": "Nutzungsbedingungen", + "contact_admin": "Administratoren kontaktieren", + "contact_adminHint": "Für Probleme mit deinem Account, der Speicherbegrenzung oder der Verfügbarkeit des Dienstes.", + "contact_dev": "Entwickler kontaktieren", + "contact_devHint": "Für Verbesserungsvorschläge oder zum Danke-Sagen.", + "contact_bug": "Fehlerbericht", + "contact_chat": "Chat", + "contact_email": "E-Mail" }