Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

config/config.example.js

@@ -278,6 +278,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
      * ===================== */
@@ -287,10 +292,18 @@ module.exports = {
      */
     logToStdout: false,
 
-    /*  CryptPad supports verbose logging
+    /* CryptPad can be configured to log more or less
-     *  (false by default)
+     * 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
@@ -298,6 +311,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,
 
@@ -337,4 +353,8 @@ module.exports = {
      */
     rpc: './rpc.js',
 
+    /*  CryptPad supports verbose logging
+     *  (false by default)
+     */
+    verbose: false,
 };

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'
                                 ])
                             )

lib/log.js

@@ -79,10 +79,14 @@ 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),
         logLevel: config.logLevel,
+        logToStdout: config.logToStdout,
     };
 
     if (!config.logPath) {
@@ -90,9 +94,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) {

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"
 }