Merge branch 'edge' into meteor-1.8

25 files changed, 763 insertions, 497 deletions

diff --git a/.meteor/packages b/.meteor/packages
index 65d54fd2..fb8a0215 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -90,3 +90,4 @@ mquandalle:moment
 msavin:usercache
 wekan:wekan-ldap
 wekan:accounts-cas
+msavin:sjobs
\ No newline at end of file
diff --git a/.meteor/versions b/.meteor/versions
index 8d10ad73..4513dd50 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -121,6 +121,7 @@ mquandalle:jquery-ui-drag-drop-sort@0.2.0
 mquandalle:moment@1.0.1
 mquandalle:mousetrap-bindglobal@0.0.1
 mquandalle:perfect-scrollbar@0.6.5_2
+msavin:sjobs@3.0.6
 msavin:usercache@1.0.0
 npm-bcrypt@0.9.3
 npm-mongo@3.1.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9d2e5fb..c808ae70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,20 @@
-# Upcoming Wekan release
+# v1.79 2018-12-03 Wekan release
 
-This release fixes the following bugs:
+This release adds the following new features:
+
+- [Improve authentication, removing Login password/LDAP dropdown](https://github.com/wekan/wekan/issues/2016).
+  NOTE: This was added in v1.71, then reverted at v1.73 because login did not work, and after fix added back at v1.79.
+  Thanks to Akuket.
+- Thanks to xet7:
+  - Build snap also on i386, armhf and arm64. Ignore if it fails. More fixes will be added later.
+  - Add CORS https://enable-cors.org/server_meteor.html to Standalone Wekan settings.
+  - Add missing LDAP and TIMER environment variables.
+
+and fixes the following bugs:
 
 - Fix: Message box for deleting subtask unreachable.
   Thanks to hupptechnologies. Closes #1800
+- Fix wrong dates in ChangeLog. Thanks to kelvinhammond.
 
 Thanks to above GitHub users for their contributions.
 
@@ -59,6 +70,7 @@ Thanks to GitHub user alkemyst for contributions.
 This release fixes the following bugs:
 
 - Revert Improve authentication to [fix Login failure](https://github.com/wekan/wekan/issues/2004).
+  NOTE: This was added in v1.71, then reverted at v1.73 because login did not work, and after fix added back at v1.79.
 
 Thanks to GitHub users Broxxx3 and xet7 for their contributions.
 
@@ -80,6 +92,7 @@ This release adds the following new features and bugfixes:
   - Adding an option to choose the default authentication method with env var.
   - Bug fix that allowed a user to connect with the password method while his user.authenticationMethod is "ldap" for example.
   - Adding a server-side method which allows disconnecting a user after a delay defined by env vars.
+  - NOTE: This was added in v1.71, then reverted at v1.73 because login did not work, and after fix added back at v1.79.
 - [Improve shell scripts](https://github.com/wekan/wekan/pull/2002). Thanks to warnerjon12.
 
 Thanks to above GitHub users and translators for their contributions.
@@ -185,11 +198,11 @@ REST API: [Allow to remove the full list of labels/members through the API](http
 
 Thanks to GitHub user bentiss for contributions.
 
-# v1.62 2018-20-24 Wekan release
+# v1.62 2018-10-24 Wekan release
 
 - Fix missing dropdown arrow on Chrome. Thanks to xet7. Closes #1964
 
-# v1.61 2018-20-24 Wekan release
+# v1.61 2018-10-24 Wekan release
 
 - Fix lint error. Thanks to xet7.
 
diff --git a/Dockerfile b/Dockerfile
index f9b71521..966e0e1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,6 +65,11 @@ ARG LDAP_SYNC_USER_DATA
 ARG LDAP_SYNC_USER_DATA_FIELDMAP
 ARG LDAP_SYNC_GROUP_ROLES
 ARG LDAP_DEFAULT_DOMAIN
+ARG LOGOUT_WITH_TIMER
+ARG LOGOUT_IN
+ARG LOGOUT_ON_HOURS
+ARG LOGOUT_ON_MINUTES
+ARG CORS
 
 # Set the environment variables (defaults where required)
 # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
@@ -133,6 +138,11 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
     LDAP_SYNC_USER_DATA_FIELDMAP="" \
     LDAP_SYNC_GROUP_ROLES="" \
     LDAP_DEFAULT_DOMAIN=""
+    LOGOUT_WITH_TIMER="false" \
+    LOGOUT_IN="" \
+    LOGOUT_ON_HOURS="" \
+    LOGOUT_ON_MINUTES="" \
+    CORS=""
 
 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index e434eaba..969ec6a9 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -23,7 +23,6 @@ template(name="userFormsLayout")
         br
     section.auth-dialog
       +Template.dynamic(template=content)
-      +connectionMethod
       if isCas
         .at-form
           button#cas(class='at-btn submit' type='submit') {{casSignInLabel}}
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index d4a9d6d1..0f64ca14 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -6,29 +6,14 @@ const i18nTagToT9n = (i18nTag) => {
   return i18nTag;
 };
 
-const validator = {
-  set(obj, prop, value) {
-    if (prop === 'state' && value !== 'signIn') {
-      $('.at-form-authentication').hide();
-    } else if (prop === 'state' && value === 'signIn') {
-      $('.at-form-authentication').show();
-    }
-    // The default behavior to store the value
-    obj[prop] = value;
-    // Indicate success
-    return true;
-  },
-};
-
-Template.userFormsLayout.onCreated(() => {
+Template.userFormsLayout.onCreated(function() {
+  Meteor.call('getDefaultAuthenticationMethod', (error, result) => {
+    this.data.defaultAuthenticationMethod = new ReactiveVar(error ? undefined : result);
+  });
   Meteor.subscribe('setting');
-
 });
 
 Template.userFormsLayout.onRendered(() => {
-
-  AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator);
-
   const i18nTag = navigator.language;
   if (i18nTag) {
     T9n.setLanguage(i18nTagToT9n(i18nTag));
@@ -37,7 +22,6 @@ Template.userFormsLayout.onRendered(() => {
 });
 
 Template.userFormsLayout.helpers({
-
   currentSetting() {
     return Settings.findOne();
   },
@@ -92,13 +76,14 @@ Template.userFormsLayout.events({
       }
     });
   },
-  'click #at-btn'(event) {
+  'click #at-btn'(event, instance) {
     /* All authentication method can be managed/called here.
        !! DON'T FORGET to correctly fill the fields of the user during its creation if necessary authenticationMethod : String !!
     */
-    const authenticationMethodSelected = $('.select-authentication').val();
-    // Local account
-    if (authenticationMethodSelected === 'password') {
+    const email = $('#at-field-username_and_email').val();
+    const password = $('#at-field-password').val();
+
+    if (FlowRouter.getRouteName() !== 'atSignIn' || password === '' || email === '') {
       return;
     }
 
@@ -106,29 +91,11 @@ Template.userFormsLayout.events({
     event.preventDefault();
     event.stopImmediatePropagation();
 
-    const email = $('#at-field-username_and_email').val();
-    const password = $('#at-field-password').val();
-
-    // Ldap account
-    if (authenticationMethodSelected === 'ldap') {
-      // Check if the user can use the ldap connection
-      Meteor.subscribe('user-authenticationMethod', email, {
-        onReady() {
-          const user = Users.findOne();
-          if (user === undefined || user.authenticationMethod === 'ldap') {
-            // Use the ldap connection package
-            Meteor.loginWithLDAP(email, password, function(error) {
-              if (!error) {
-                // Connection
-                return FlowRouter.go('/');
-              }
-              return error;
-            });
-          }
-          return this.stop();
-        },
-      });
-    }
+    Meteor.subscribe('user-authenticationMethod', email, {
+      onReady() {
+        return authentication.call(this, instance, email, password);
+      },
+    });
   },
 });
 
@@ -137,3 +104,38 @@ Template.defaultLayout.events({
     Modal.close();
   },
 });
+
+function authentication(instance, email, password) {
+  let user = Users.findOne();
+  // Authentication with password
+  if (user && user.authenticationMethod === 'password') {
+    $('#at-pwd-form').submit();
+    // Meteor.call('logoutWithTimer', user._id, () => {});
+    return this.stop();
+  }
+
+  // If user doesn't exist, uses the default authentication method if it defined
+  if (user === undefined) {
+    user = {
+      'authenticationMethod': instance.data.defaultAuthenticationMethod.get(),
+    };
+  }
+
+  // Authentication with LDAP
+  if (user.authenticationMethod === 'ldap') {
+    // Use the ldap connection package
+    Meteor.loginWithLDAP(email, password, function(error) {
+      if (!error) {
+        // Meteor.call('logoutWithTimer', Users.findOne()._id, () => {});
+        return FlowRouter.go('/');
+      }
+      return error;
+    });
+  }
+
+  /* else {
+    process.env.DEFAULT_AUTHENTICATION_METHOD is not defined
+  } */
+
+  return this.stop();
+}
diff --git a/docker-compose-build.yml b/docker-compose-build.yml
index 58c5c525..a3ee2bd6 100644
--- a/docker-compose-build.yml
+++ b/docker-compose-build.yml
@@ -45,6 +45,8 @@ services:
       # Wekan Export Board works when WITH_API=true.
       # If you disable Wekan API with false, Export Board does not work.
       - WITH_API=true
+      # CORS: Set Access-Control-Allow-Origin header. Example: *
+      #- CORS=*
       # Optional: Integration with Matomo https://matomo.org that is installed to your server
       # The address of the server where Matomo is hosted.
       # example: - MATOMO_ADDRESS=https://example.com/matomo
@@ -209,6 +211,18 @@ services:
       # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
       # example :
       #- LDAP_DEFAULT_DOMAIN=
+      # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
+      # example : LOGOUT_WITH_TIMER=true
+      #- LOGOUT_WITH_TIMER=
+      # LOGOUT_IN : The number of days
+      # example : LOGOUT_IN=1
+      #- LOGOUT_IN=
+      # LOGOUT_ON_HOURS : The number of hours
+      # example : LOGOUT_ON_HOURS=9
+      #- LOGOUT_ON_HOURS=
+      # LOGOUT_ON_MINUTES : The number of minutes
+      # example : LOGOUT_ON_MINUTES=55
+      #- LOGOUT_ON_MINUTES=
 
     depends_on:
       - wekandb
diff --git a/docker-compose-postgresql.yml b/docker-compose-postgresql.yml
index c8844408..ab15d978 100644
--- a/docker-compose-postgresql.yml
+++ b/docker-compose-postgresql.yml
@@ -67,6 +67,8 @@ services:
       # Wekan Export Board works when WITH_API='true'.
       # If you disable Wekan API, Export Board does not work.
       - WITH_API=true
+      # CORS: Set Access-Control-Allow-Origin header. Example: *
+      #- CORS=*
       # Optional: Integration with Matomo https://matomo.org that is installed to your server
       # The address of the server where Matomo is hosted.
       # example: - MATOMO_ADDRESS=https://example.com/matomo
@@ -231,7 +233,18 @@ services:
       # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
       # example :
       #- LDAP_DEFAULT_DOMAIN=
-
+      # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
+      # example : LOGOUT_WITH_TIMER=true
+      #- LOGOUT_WITH_TIMER=
+      # LOGOUT_IN : The number of days
+      # example : LOGOUT_IN=1
+      #- LOGOUT_IN=
+      # LOGOUT_ON_HOURS : The number of hours
+      # example : LOGOUT_ON_HOURS=9
+      #- LOGOUT_ON_HOURS=
+      # LOGOUT_ON_MINUTES : The number of minutes
+      # example : LOGOUT_ON_MINUTES=55
+      #- LOGOUT_ON_MINUTES=
 
     depends_on:
       - mongodb
diff --git a/docker-compose.yml b/docker-compose.yml
index 4d3f1c9b..0cb58cff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,6 +34,8 @@ services:
       # Wekan Export Board works when WITH_API=true.
       # If you disable Wekan API with false, Export Board does not work.
       - WITH_API=true
+      # CORS: Set Access-Control-Allow-Origin header. Example: *
+      #- CORS=*
       # Optional: Integration with Matomo https://matomo.org that is installed to your server
       # The address of the server where Matomo is hosted.
       # example: - MATOMO_ADDRESS=https://example.com/matomo
@@ -198,6 +200,18 @@ services:
       # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
       # example :
       #- LDAP_DEFAULT_DOMAIN=
+      # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
+      # example : LOGOUT_WITH_TIMER=true
+      #- LOGOUT_WITH_TIMER=
+      # LOGOUT_IN : The number of days
+      # example : LOGOUT_IN=1
+      #- LOGOUT_IN=
+      # LOGOUT_ON_HOURS : The number of hours
+      # example : LOGOUT_ON_HOURS=9
+      #- LOGOUT_ON_HOURS=
+      # LOGOUT_ON_MINUTES : The number of minutes
+      # example : LOGOUT_ON_MINUTES=55
+      #- LOGOUT_ON_MINUTES=
 
     depends_on:
       - wekandb
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index 1bcedb34..d90d7031 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -123,7 +123,7 @@
     "card-comments-title": "Cette carte a %s commentaires.",
     "card-delete-notice": "La suppression est permanente. Vous perdrez toutes les actions associées à cette carte.",
     "card-delete-pop": "Toutes les actions vont être supprimées du suivi d'activités et vous ne pourrez plus utiliser cette carte. Cette action est irréversible.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "Vous pouvez déplacer une carte vers les archives afin de l'enlever du tableau tout en préservant l'activité.",
     "card-due": "À échéance",
     "card-due-on": "Échéance le",
     "card-spent": "Temps passé",
@@ -166,7 +166,7 @@
     "clipboard": "Presse-papier ou glisser-déposer",
     "close": "Fermer",
     "close-board": "Fermer le tableau",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "Vous pouvez restaurer le tableau en cliquant sur le bouton « Archives » depuis le menu en entête.",
     "color-black": "noir",
     "color-blue": "bleu",
     "color-green": "vert",
@@ -284,13 +284,13 @@
     "import-board-c": "Importer un tableau",
     "import-board-title-trello": "Importer le tableau depuis Trello",
     "import-board-title-wekan": "Importer un tableau depuis Wekan",
-    "import-sandstorm-backup-warning": "Do not delete data you import from original Wekan or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-backup-warning": "Ne supprimez pas les données que vous importez du Wekan ou Trello original avant de vérifier que la graine peut se fermer et s'ouvrir à nouveau, ou qu'une erreur \"Tableau introuvable\" survient, sinon vous perdrez vos données.",
     "import-sandstorm-warning": "Le tableau importé supprimera toutes les données du tableau et les remplacera avec celles du tableau importé.",
     "from-trello": "Depuis Trello",
     "from-wekan": "Depuis Wekan",
     "import-board-instruction-trello": "Dans votre tableau Trello, allez sur 'Menu', puis sur 'Plus', 'Imprimer et exporter', 'Exporter en JSON' et copiez le texte du résultat",
     "import-board-instruction-wekan": "Dans votre tableau Wekan, allez dans 'Menu', puis 'Exporter un tableau', et copier le texte du fichier téléchargé.",
-    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-board-instruction-about-errors": "Si une erreur survient en important le tableau, il se peut que l'import ait fonctionné, et que le tableau se trouve sur la page \"Tous les tableaux\".",
     "import-json-placeholder": "Collez ici les données JSON valides",
     "import-map-members": "Faire correspondre aux membres",
     "import-members-map": "Le tableau que vous venez d'importer contient des membres. Veuillez associer les membres que vous souhaitez importer à des utilisateurs de Wekan.",
@@ -315,8 +315,8 @@
     "leave-board-pop": "Êtes-vous sur de vouloir quitter __boardTitle__ ? Vous ne serez plus associé aux cartes de ce tableau.",
     "leaveBoardPopup-title": "Quitter le tableau",
     "link-card": "Lier à cette carte",
-    "list-archive-cards": "Move all cards in this list to Archive",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-archive-cards": "Déplacer toutes les cartes de cette liste vers les archives",
+    "list-archive-cards-pop": "Cela supprimera du tableau toutes les cartes de cette liste. Pour voir les cartes archivées et les renvoyer vers le tableau, cliquez sur « Menu » puis « Archives ».",
     "list-move-cards": "Déplacer toutes les cartes de cette liste",
     "list-select-cards": "Sélectionner toutes les cartes de cette liste",
     "listActionPopup-title": "Actions sur la liste",
@@ -618,5 +618,5 @@
     "authentication-type": "Type d'authentification",
     "custom-product-name": "Nom personnalisé",
     "layout": "Interface",
-    "hide-logo": "Hide Logo"
+    "hide-logo": "Cacher le logo"
 }
\ No newline at end of file
diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json
index 07e99fbe..2470c3f4 100644
--- a/i18n/sv.i18n.json
+++ b/i18n/sv.i18n.json
@@ -11,10 +11,10 @@
     "act-createCustomField": "skapa anpassat fält __customField__",
     "act-createList": "lade till __list__ to __board__",
     "act-addBoardMember": "lade till __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Archive",
-    "act-archivedCard": "__card__ moved to Archive",
-    "act-archivedList": "__list__ moved to Archive",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
+    "act-archivedBoard": "__board__ flyttades till Arkiv",
+    "act-archivedCard": "__card__ flyttades till Arkiv",
+    "act-archivedList": "__list__ flyttades till Arkiv",
+    "act-archivedSwimlane": "__swimlane__ flyttades till Arkiv",
     "act-importBoard": "importerade __board__",
     "act-importCard": "importerade __card__",
     "act-importList": "importerade __list__",
@@ -29,7 +29,7 @@
     "activities": "Aktiviteter",
     "activity": "Aktivitet",
     "activity-added": "Lade %s till %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s flyttades till Arkiv",
     "activity-attached": "bifogade %s to %s",
     "activity-created": "skapade %s",
     "activity-customfield-created": "skapa anpassat fält %s",
@@ -79,8 +79,8 @@
     "and-n-other-card_plural": "Och __count__ andra kort",
     "apply": "Tillämpa",
     "app-is-offline": "Wekan läses in, var god vänta. Uppdatering av sidan kommer att leda till förlust av data. Om Wekan inte läses in, kontrollera att Wekan-servern inte har stoppats.",
-    "archive": "Move to Archive",
-    "archive-all": "Move All to Archive",
+    "archive": "Flytta till Arkiv",
+    "archive-all": "Flytta alla till Arkiv",
     "archive-board": "Move Board to Archive",
     "archive-card": "Move Card to Archive",
     "archive-list": "Move List to Archive",
@@ -558,7 +558,7 @@
     "r-when-a-attach": "When an attachment",
     "r-when-a-checklist": "When a checklist is",
     "r-when-the-checklist": "When the checklist",
-    "r-completed": "Completed",
+    "r-completed": "Avslutad",
     "r-made-incomplete": "Made incomplete",
     "r-when-a-item": "When a checklist item is",
     "r-when-the-item": "When the checklist item",
@@ -568,8 +568,8 @@
     "r-top-of": "Top of",
     "r-bottom-of": "Bottom of",
     "r-its-list": "its list",
-    "r-archive": "Move to Archive",
-    "r-unarchive": "Restore from Archive",
+    "r-archive": "Flytta till Arkiv",
+    "r-unarchive": "Återställ från Arkiv",
     "r-card": "kort",
     "r-add": "Lägg till",
     "r-remove": "Ta bort",
@@ -614,9 +614,9 @@
     "ldap": "LDAP",
     "oauth2": "OAuth2",
     "cas": "CAS",
-    "authentication-method": "Authentication method",
-    "authentication-type": "Authentication type",
-    "custom-product-name": "Custom Product Name",
+    "authentication-method": "Autentiseringsmetod",
+    "authentication-type": "Autentiseringstyp",
+    "custom-product-name": "Anpassat produktnamn",
     "layout": "Layout",
-    "hide-logo": "Hide Logo"
+    "hide-logo": "Dölj logotypen"
 }
\ No newline at end of file
diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json
index 952aae32..b5a96bce 100644
--- a/i18n/tr.i18n.json
+++ b/i18n/tr.i18n.json
@@ -29,7 +29,7 @@
     "activities": "Etkinlikler",
     "activity": "Etkinlik",
     "activity-added": "%s içine %s ekledi",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s arşive taşındı",
     "activity-attached": "%s içine %s ekledi",
     "activity-created": "%s öğesini oluşturdu",
     "activity-customfield-created": "%s adlı özel alan yaratıldı",
@@ -79,18 +79,18 @@
     "and-n-other-card_plural": "Ve __count__ diğer kart",
     "apply": "Uygula",
     "app-is-offline": "Wekan yükleniyor, lütfen bekleyin. Sayfayı yenilemek veri kaybına sebep olabilir. Eğer Wekan yüklenmezse, lütfen Wekan sunucusunun çalıştığından emin olun.",
-    "archive": "Move to Archive",
-    "archive-all": "Move All to Archive",
-    "archive-board": "Move Board to Archive",
-    "archive-card": "Move Card to Archive",
-    "archive-list": "Move List to Archive",
-    "archive-swimlane": "Move Swimlane to Archive",
-    "archive-selection": "Move selection to Archive",
-    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archive": "Arşive Taşı",
+    "archive-all": "Hepsini Arşive Taşı",
+    "archive-board": "Panoyu Arşive Taşı",
+    "archive-card": "Kartı Arşive Taşı",
+    "archive-list": "Listeyi Arşive Taşı",
+    "archive-swimlane": "Kulvarı Arşive Taşı",
+    "archive-selection": "Seçimi arşive taşı",
+    "archiveBoardPopup-title": "Panoyu arşive taşı?",
     "archived-items": "Arşivle",
-    "archived-boards": "Boards in Archive",
+    "archived-boards": "Panolar Arşivde",
     "restore-board": "Panoyu Geri Getir",
-    "no-archived-boards": "No Boards in Archive.",
+    "no-archived-boards": "Arşivde Pano Yok.",
     "archives": "Arşivle",
     "assign-member": "Üye ata",
     "attached": "dosya(sı) eklendi",
@@ -118,8 +118,8 @@
     "board-view-lists": "Listeler",
     "bucket-example": "Örn: \"Marketten Alacaklarım\"",
     "cancel": "İptal",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "Bu kart arşive taşındı.",
+    "board-archived": "Bu pano arşive taşındı.",
     "card-comments-title": "Bu kartta %s yorum var.",
     "card-delete-notice": "Silme işlemi kalıcıdır. Bu kartla ilişkili tüm eylemleri kaybedersiniz.",
     "card-delete-pop": "Son hareketler alanındaki tüm veriler silinecek, ayrıca bu kartı yeniden açamayacaksın. Bu işlemin geri dönüşü yok.",
@@ -147,8 +147,8 @@
     "cards-count": "Kartlar",
     "casSignIn": "CAS ile giriş yapın",
     "cardType-card": "Kart",
-    "cardType-linkedCard": "Linked Card",
-    "cardType-linkedBoard": "Linked Board",
+    "cardType-linkedCard": "Bağlantılı kart",
+    "cardType-linkedBoard": "Bağlantılı Pano",
     "change": "Değiştir",
     "change-avatar": "Avatar Değiştir",
     "change-password": "Parola Değiştir",
@@ -181,14 +181,14 @@
     "comment-placeholder": "Yorum Yaz",
     "comment-only": "Sadece yorum",
     "comment-only-desc": "Sadece kartlara yorum yazabilir.",
-    "no-comments": "No comments",
-    "no-comments-desc": "Can not see comments and activities.",
+    "no-comments": "Yorum Yok",
+    "no-comments-desc": "Yorumlar ve aktiviteleri göremiyorum.",
     "computer": "Bilgisayar",
-    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
+    "confirm-subtask-delete-dialog": "Alt görevi silmek istediğinizden emin misiniz?",
+    "confirm-checklist-delete-dialog": "Kontrol listesini silmek istediğinden emin misin?",
     "copy-card-link-to-clipboard": "Kartın linkini kopyala",
-    "linkCardPopup-title": "Link Card",
-    "searchCardPopup-title": "Search Card",
+    "linkCardPopup-title": "Bağlantı kartı",
+    "searchCardPopup-title": "Kart Ara",
     "copyCardPopup-title": "Kartı Kopyala",
     "copyChecklistToManyCardsPopup-title": "Yapılacaklar Listesi şemasını birden çok karta kopyala",
     "copyChecklistToManyCardsPopup-instructions": "Hedef Kart Başlıkları ve Açıklamaları bu JSON formatında",
@@ -271,7 +271,7 @@
     "filter-on": "Filtre aktif",
     "filter-on-desc": "Bu panodaki kartları filtreliyorsunuz. Fitreyi düzenlemek için tıklayın.",
     "filter-to-selection": "Seçime göre filtreleme yap",
-    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-label": "Gelişmiş Filtreleme",
     "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Ad Soyad",
     "header-logo-title": "Panolar sayfanıza geri dön.",
@@ -315,7 +315,7 @@
     "leave-board-pop": "__boardTitle__ panosundan ayrılmak istediğinize emin misiniz? Panodaki tüm kartlardan kaldırılacaksınız.",
     "leaveBoardPopup-title": "Panodan ayrılmak istediğinize emin misiniz?",
     "link-card": "Bu kartın bağlantısı",
-    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards": "Bu listedeki tüm kartları arşive taşı",
     "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Listedeki tüm kartları taşı",
     "list-select-cards": "Listedeki tüm kartları seç",
@@ -345,9 +345,9 @@
     "muted-info": "Bu panodaki hiçbir değişiklik hakkında bildirim almayacaksınız",
     "my-boards": "Panolarım",
     "name": "Adı",
-    "no-archived-cards": "No cards in Archive.",
-    "no-archived-lists": "No lists in Archive.",
-    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-archived-cards": "Arşivde kart yok",
+    "no-archived-lists": "Arşivde liste yok",
+    "no-archived-swimlanes": "Arşivde kulvar yok",
     "no-results": "Sonuç yok",
     "normal": "Normal",
     "normal-desc": "Kartları görüntüleyebilir ve düzenleyebilir. Ayarları değiştiremez.",
@@ -383,7 +383,7 @@
     "restore": "Geri Getir",
     "save": "Kaydet",
     "search": "Arama",
-    "rules": "Rules",
+    "rules": "Kurallar",
     "search-cards": "Bu tahta da ki kart başlıkları ve açıklamalarında arama yap",
     "search-example": "Aranılacak metin?",
     "select-color": "Renk Seç",
@@ -427,7 +427,7 @@
     "uploaded-avatar": "Avatar yüklendi",
     "username": "Kullanıcı adı",
     "view-it": "Görüntüle",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "Uyarı: Bu kart arşivdeki bir listede",
     "watch": "Takip Et",
     "watching": "Takip Ediliyor",
     "watching-info": "Bu pano hakkındaki tüm değişiklikler hakkında bildirim alacaksınız",
@@ -484,8 +484,8 @@
     "minutes": "dakika",
     "seconds": "saniye",
     "show-field-on-card": "Bu alanı kartta göster",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
+    "automatically-field-on-card": "Tüm kartlara otomatik alan oluştur",
+    "showLabel-field-on-card": "Minikard üzerindeki alan etiketini göster",
     "yes": "Evet",
     "no": "Hayır",
     "accounts": "Hesaplar",
@@ -504,119 +504,119 @@
     "requested-by": "Talep Eden",
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
     "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
-    "boardDeletePopup-title": "Delete Board?",
-    "delete-board": "Delete Board",
+    "boardDeletePopup-title": "Panoyu Sil?",
+    "delete-board": "Panoyu Sil",
     "default-subtasks-board": "Subtasks for __board__ board",
     "default": "Varsayılan",
     "queue": "Sıra",
-    "subtask-settings": "Subtasks Settings",
-    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
-    "show-subtasks-field": "Cards can have subtasks",
+    "subtask-settings": "Alt Görev ayarları",
+    "boardSubtaskSettingsPopup-title": "Pano alt görev ayarları",
+    "show-subtasks-field": "Kartların alt görevleri olabilir",
     "deposit-subtasks-board": "Deposit subtasks to this board:",
-    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
-    "show-parent-in-minicard": "Show parent in minicard:",
-    "prefix-with-full-path": "Prefix with full path",
+    "deposit-subtasks-list": "Alt görevlerin açılacağı liste:",
+    "show-parent-in-minicard": "Mini kart içinde üst kartı göster",
+    "prefix-with-full-path": "Tam yolunu önüne ekle",
     "prefix-with-parent": "Prefix with parent",
-    "subtext-with-full-path": "Subtext with full path",
-    "subtext-with-parent": "Subtext with parent",
-    "change-card-parent": "Change card's parent",
-    "parent-card": "Parent card",
-    "source-board": "Source board",
-    "no-parent": "Don't show parent",
+    "subtext-with-full-path": "Tam yolu ile alt metin",
+    "subtext-with-parent": "üst öge ile alt metin",
+    "change-card-parent": "Kartın üst kartını değiştir",
+    "parent-card": "Ana kart",
+    "source-board": "Kaynak panosu",
+    "no-parent": "Üst ögeyi gösterme",
     "activity-added-label": "added label '%s' to %s",
     "activity-removed-label": "removed label '%s' from %s",
     "activity-delete-attach": "deleted an attachment from %s",
     "activity-added-label-card": "added label '%s'",
     "activity-removed-label-card": "removed label '%s'",
-    "activity-delete-attach-card": "deleted an attachment",
-    "r-rule": "Rule",
-    "r-add-trigger": "Add trigger",
-    "r-add-action": "Add action",
-    "r-board-rules": "Board rules",
-    "r-add-rule": "Add rule",
-    "r-view-rule": "View rule",
-    "r-delete-rule": "Delete rule",
-    "r-new-rule-name": "New rule title",
-    "r-no-rules": "No rules",
+    "activity-delete-attach-card": "Ek silindi",
+    "r-rule": "Kural",
+    "r-add-trigger": "Tetikleyici ekle",
+    "r-add-action": "Eylem ekle",
+    "r-board-rules": "Pano Kuralları",
+    "r-add-rule": "Kural ekle",
+    "r-view-rule": "Kuralı göster",
+    "r-delete-rule": "Kuralı sil",
+    "r-new-rule-name": "Yeni kural başlığı",
+    "r-no-rules": "Kural yok",
     "r-when-a-card-is": "When a card is",
     "r-added-to": "Added to",
     "r-removed-from": "Removed from",
-    "r-the-board": "the board",
-    "r-list": "list",
+    "r-the-board": "pano",
+    "r-list": "liste",
     "r-moved-to": "Moved to",
     "r-moved-from": "Moved from",
-    "r-archived": "Moved to Archive",
-    "r-unarchived": "Restored from Archive",
-    "r-a-card": "a card",
+    "r-archived": "Arşive taşındı",
+    "r-unarchived": "Arşivden geri çıkarıldı",
+    "r-a-card": "Kart",
     "r-when-a-label-is": "When a label is",
     "r-when-the-label-is": "When the label is",
-    "r-list-name": "List name",
+    "r-list-name": "Liste İsmi",
     "r-when-a-member": "When a member is",
     "r-when-the-member": "When the member",
-    "r-name": "name",
+    "r-name": "isim",
     "r-is": "is",
     "r-when-a-attach": "When an attachment",
     "r-when-a-checklist": "When a checklist is",
     "r-when-the-checklist": "When the checklist",
-    "r-completed": "Completed",
-    "r-made-incomplete": "Made incomplete",
+    "r-completed": "Tamamlandı",
+    "r-made-incomplete": "Tamamlanmamış",
     "r-when-a-item": "When a checklist item is",
     "r-when-the-item": "When the checklist item",
-    "r-checked": "Checked",
-    "r-unchecked": "Unchecked",
-    "r-move-card-to": "Move card to",
-    "r-top-of": "Top of",
-    "r-bottom-of": "Bottom of",
+    "r-checked": "İşaretlendi",
+    "r-unchecked": "İşaret Kaldırıldı",
+    "r-move-card-to": "Kartı taşı",
+    "r-top-of": "En üst",
+    "r-bottom-of": "En alt",
     "r-its-list": "its list",
-    "r-archive": "Move to Archive",
-    "r-unarchive": "Restore from Archive",
-    "r-card": "card",
+    "r-archive": "Arşive Taşı",
+    "r-unarchive": "Arşivden Geri Yükle",
+    "r-card": "Kart",
     "r-add": "Ekle",
-    "r-remove": "Remove",
+    "r-remove": "Kaldır",
     "r-label": "label",
-    "r-member": "member",
+    "r-member": "üye",
     "r-remove-all": "Remove all members from the card",
-    "r-checklist": "checklist",
-    "r-check-all": "Check all",
-    "r-uncheck-all": "Uncheck all",
-    "r-items-check": "items of checklist",
-    "r-check": "Check",
-    "r-uncheck": "Uncheck",
+    "r-checklist": "Kontrol Listesi",
+    "r-check-all": "Tümünü işaretle",
+    "r-uncheck-all": "Tüm işaretleri kaldır",
+    "r-items-check": "Kontrol Listesi maddeleri",
+    "r-check": "işaretle",
+    "r-uncheck": "İşareti Kaldır",
     "r-item": "item",
     "r-of-checklist": "of checklist",
-    "r-send-email": "Send an email",
+    "r-send-email": "E-Posta Gönder",
     "r-to": "to",
-    "r-subject": "subject",
-    "r-rule-details": "Rule details",
+    "r-subject": "Konu",
+    "r-rule-details": "Kural Detayları",
     "r-d-move-to-top-gen": "Move card to top of its list",
     "r-d-move-to-top-spec": "Move card to top of list",
     "r-d-move-to-bottom-gen": "Move card to bottom of its list",
     "r-d-move-to-bottom-spec": "Move card to bottom of list",
-    "r-d-send-email": "Send email",
+    "r-d-send-email": "E-Posta gönder",
     "r-d-send-email-to": "to",
-    "r-d-send-email-subject": "subject",
-    "r-d-send-email-message": "message",
-    "r-d-archive": "Move card to Archive",
-    "r-d-unarchive": "Restore card from Archive",
-    "r-d-add-label": "Add label",
-    "r-d-remove-label": "Remove label",
-    "r-d-add-member": "Add member",
-    "r-d-remove-member": "Remove member",
-    "r-d-remove-all-member": "Remove all member",
+    "r-d-send-email-subject": "Konu",
+    "r-d-send-email-message": "mesaj",
+    "r-d-archive": "Kartı Arşive Taşı",
+    "r-d-unarchive": "Kartı arşivden geri yükle",
+    "r-d-add-label": "Etiket ekle",
+    "r-d-remove-label": "Etiketi kaldır",
+    "r-d-add-member": "Üye Ekle",
+    "r-d-remove-member": "Üye Sil",
+    "r-d-remove-all-member": "Tüm Üyeleri Sil",
     "r-d-check-all": "Check all items of a list",
     "r-d-uncheck-all": "Uncheck all items of a list",
     "r-d-check-one": "Check item",
     "r-d-uncheck-one": "Uncheck item",
     "r-d-check-of-list": "of checklist",
-    "r-d-add-checklist": "Add checklist",
-    "r-d-remove-checklist": "Remove checklist",
+    "r-d-add-checklist": "Kontrol listesine ekle",
+    "r-d-remove-checklist": "Kontrol listesini kaldır",
     "r-when-a-card-is-moved": "When a card is moved to another list",
     "ldap": "LDAP",
-    "oauth2": "OAuth2",
+    "oauth2": "Oauth2",
     "cas": "CAS",
-    "authentication-method": "Authentication method",
-    "authentication-type": "Authentication type",
-    "custom-product-name": "Custom Product Name",
-    "layout": "Layout",
-    "hide-logo": "Hide Logo"
+    "authentication-method": "Kimlik doğrulama yöntemi",
+    "authentication-type": "Kimlik doğrulama türü",
+    "custom-product-name": "Özel Ürün Adı",
+    "layout": "Düzen",
+    "hide-logo": "Logoyu Gizle"
 }
\ No newline at end of file
diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json
index 8da0b566..2984137a 100644
--- a/i18n/zh-CN.i18n.json
+++ b/i18n/zh-CN.i18n.json
@@ -11,10 +11,10 @@
     "act-createCustomField": "创建了自定义字段 __customField__",
     "act-createList": "添加列表 __list__  至看板 __board__",
     "act-addBoardMember": "添加成员 __member__  至看板 __board__",
-    "act-archivedBoard": "__board__ moved to Archive",
-    "act-archivedCard": "__card__ moved to Archive",
-    "act-archivedList": "__list__ moved to Archive",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
+    "act-archivedBoard": "__board__ 已被移入归档",
+    "act-archivedCard": "__card__ 已被移入归档",
+    "act-archivedList": "__list__ 已被移入归档",
+    "act-archivedSwimlane": "__swimlane__ 已被移入归档",
     "act-importBoard": "导入看板 __board__",
     "act-importCard": "导入卡片 __card__",
     "act-importList": "导入列表 __list__",
@@ -29,7 +29,7 @@
     "activities": "活动",
     "activity": "活动",
     "activity-added": "添加 %s 至 %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s 已被移入归档",
     "activity-attached": "添加附件 %s 至 %s",
     "activity-created": "创建 %s",
     "activity-customfield-created": "创建了自定义字段 %s",
@@ -79,7 +79,7 @@
     "and-n-other-card_plural": "和其他 __count__ 个卡片",
     "apply": "应用",
     "app-is-offline": "Wekan 正在加载，请稍等。刷新页面将导致数据丢失。如果 Wekan 无法加载，请检查 Wekan 服务器是否已经停止。",
-    "archive": "Move to Archive",
+    "archive": "归档",
     "archive-all": "Move All to Archive",
     "archive-board": "Move Board to Archive",
     "archive-card": "Move Card to Archive",
@@ -568,7 +568,7 @@
     "r-top-of": "的顶部",
     "r-bottom-of": "的尾部",
     "r-its-list": "其清单",
-    "r-archive": "Move to Archive",
+    "r-archive": "归档",
     "r-unarchive": "Restore from Archive",
     "r-card": "卡片",
     "r-add": "添加",
diff --git a/models/settings.js b/models/settings.js
index 52212809..9ca26c48 100644
--- a/models/settings.js
+++ b/models/settings.js
@@ -239,5 +239,35 @@ if (Meteor.isServer) {
         cas: isCasEnabled(),
       };
     },
+
+    getDefaultAuthenticationMethod() {
+      return process.env.DEFAULT_AUTHENTICATION_METHOD;
+    },
+
+    // TODO: patch error : did not check all arguments during call
+    logoutWithTimer(userId) {
+      if (process.env.LOGOUT_WITH_TIMER) {
+        Jobs.run('logOut', userId, {
+          in: {
+            days: process.env.LOGOUT_IN,
+          },
+          on: {
+            hour: process.env.LOGOUT_ON_HOURS,
+            minute: process.env.LOGOUT_ON_MINUTES,
+          },
+          priority: 1,
+        });
+      }
+    },
+  });
+
+  Jobs.register({
+    logOut(userId) {
+      Meteor.users.update(
+        {_id: userId},
+        {$set: {'services.resume.loginTokens': []}}
+      );
+      this.success();
+    },
   });
 }
diff --git a/models/users.js b/models/users.js
index 630f4703..2e879d94 100644
--- a/models/users.js
+++ b/models/users.js
@@ -520,10 +520,10 @@ if (Meteor.isServer) {
     }
 
     const disableRegistration = Settings.findOne().disableRegistration;
-    // If ldap, bypass the inviation code if the self registration isn't allowed.
-    // TODO : pay attention if ldap field in the user model change to another content ex : ldap field to connection_type
-    if (options.ldap || !disableRegistration) {
-      user.authenticationMethod = 'ldap';
+    if (!disableRegistration) {
+      if (options.ldap) {
+        user.authenticationMethod = 'ldap';
+      }
       return user;
     }
 
diff --git a/package.json b/package.json
index 9337fc32..e2e60637 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v1.78.0",
+  "version": "v1.79.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {
diff --git a/releases/virtualbox/start-wekan.sh b/releases/virtualbox/start-wekan.sh
index 388e3066..2aec8004 100755
--- a/releases/virtualbox/start-wekan.sh
+++ b/releases/virtualbox/start-wekan.sh
@@ -22,6 +22,9 @@
         # If you disable Wekan API, Export Board does not work.
 	export WITH_API='true'
         #---------------------------------------------
+        # CORS: Set Access-Control-Allow-Origin header. Example: *
+        #- CORS=*
+        #---------------------------------------------
         ## Optional: Integration with Matomo https://matomo.org that is installed to your server
         ## The address of the server where Matomo is hosted:
         ##export MATOMO_ADDRESS=https://example.com/matomo
@@ -187,6 +190,17 @@
         # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
         # example :
         #export LDAP_DEFAULT_DOMAIN=
+        # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
+        # example : LOGOUT_WITH_TIMER=true
+        #- LOGOUT_WITH_TIMER=
+        # LOGOUT_IN : The number of days
+        # example : LOGOUT_IN=1
+        #- LOGOUT_IN=
+        #- LOGOUT_ON_HOURS=
+        # LOGOUT_ON_MINUTES : The number of minutes
+        # example : LOGOUT_ON_MINUTES=55
+        #- LOGOUT_ON_MINUTES=
+
 	node main.js & >> ~/repos/wekan.log
 	cd ~/repos
 #done
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 889c046c..567332ac 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 180,
+    appVersion = 181,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "1.78.0~2018-11-20"),
+    appMarketingVersion = (defaultText = "1.79.0~2018-12-03"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,
diff --git a/server/cors.js b/server/cors.js
new file mode 100644
index 00000000..80369a83
--- /dev/null
+++ b/server/cors.js
@@ -0,0 +1,11 @@
+Meteor.startup(() => {
+
+  if ( process.env.CORS ) {
+    // Listen to incoming HTTP requests, can only be used on the server
+    WebApp.rawConnectHandlers.use(function(req, res, next) {
+      res.setHeader('Access-Control-Allow-Origin', process.env.CORS);
+      return next();
+    });
+  }
+
+});
diff --git a/server/publications/users.js b/server/publications/users.js
index f0c94153..136e1e08 100644
--- a/server/publications/users.js
+++ b/server/publications/users.js
@@ -22,6 +22,7 @@ Meteor.publish('user-authenticationMethod', function(match) {
   check(match, String);
   return Users.find({$or: [{_id: match}, {email: match}, {username: match}]}, {
     fields: {
+      '_id': 1,
       'authenticationMethod': 1,
     },
   });
diff --git a/snap-src/bin/config b/snap-src/bin/config
index 0472f4f9..ac39e71c 100755
--- a/snap-src/bin/config
+++ b/snap-src/bin/config
@@ -3,7 +3,7 @@
 # All supported keys are defined here together with descriptions and default values
 
 # list of supported keys
-keys="MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN"
+keys="MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API CORS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LOGOUT_WITH_TIMER, LOGOUT_IN, LOGOUT_ON_HOURS, LOGOUT_ON_MINUTES"
 
 # default values
 DESCRIPTION_MONGODB_BIND_UNIX_SOCKET="mongodb binding unix socket:\n"\
@@ -52,6 +52,10 @@ DESCRIPTION_WITH_API="Enable/disable the api of wekan"
 DEFAULT_WITH_API="true"
 KEY_WITH_API="with-api"
 
+DESCRIPTION_CORS="Enable/disable CORS: Set Access-Control-Allow-Origin header. Example: *"
+DEFAULT_CORS=""
+KEY_CORS="cors"
+
 DESCRIPTION_MATOMO_ADDRESS="The address of the server where matomo is hosted"
 DEFAULT_MATOMO_ADDRESS=""
 KEY_MATOMO_ADDRESS="matomo-address"
@@ -269,3 +273,19 @@ KEY_LDAP_SYNC_GROUP_ROLES="ldap-sync-group-roles"
 DESCRIPTION_LDAP_DEFAULT_DOMAIN="The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP"
 DEFAULT_LDAP_DEFAULT_DOMAIN=""
 KEY_LDAP_DEFAULT_DOMAIN="ldap-default-domain"
+
+DESCRIPTION_LOGOUT_WITH_TIMER="Enables or not the option logout with timer"
+DEFAULT_LOGOUT_WITH_TIMER="false"
+KEY_LOGOUT_WITH_TIMER="logout-with-timer"
+
+DESCRIPTION_LOGOUT_IN="The number of days"
+DEFAULT_LOGOUT_IN=""
+KEY_LOGOUT_IN="logout-in"
+
+DESCRIPTION_LOGOUT_ON_HOURS="The number of hours"
+DEFAULT_LOGOUT_ON_HOURS=""
+KEY_LOGOUT_ON_HOURS="logout-on-hours"
+
+DESCRIPTION_LOGOUT_ON_MINUTES="The number of minutes"
+DEFAULT_LOGOUT_ON_MINUTES=""
+KEY_LOGOUT_ON_MINUTES="logout-on-minutes"
diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help
index f28f8f9d..804f9ad6 100755
--- a/snap-src/bin/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -33,6 +33,11 @@ echo -e "\t$ snap set $SNAP_NAME WITH_API='true'"
 echo -e "\t-Disable the API:"
 echo -e "\t$ snap set $SNAP_NAME WITH_API='false'"
 echo -e "\n"
+echo -e "To enable the CORS of wekan, to set Access-Control-Allow-Origin header:"
+echo -e "\t$ snap set $SNAP_NAME CORS='*'"
+echo -e "\t-Disable the CORS:"
+echo -e "\t$ snap set $SNAP_NAME CORS=''"
+echo -e "\n"
 echo -e "Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside."
 echo -e "\t\t Setting this to false is not recommended, it also disables all other browser policy protections"
 echo -e "\t\t and allows all iframing etc. See wekan/server/policy.js"
@@ -249,6 +254,22 @@ echo -e "Ldap Default Domain."
 echo -e "The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP:"
 echo -e "\t$ snap set $SNAP_NAME LDAP_DEFAULT_DOMAIN=''"
 echo -e "\n"
+echo -e "Logout with timer."
+echo -e "Enable or not the option that allows to disconnect an user after a given time:"
+echo -e "\t$ snap set $SNAP_NAME LOGOUT_WITH_TIMER='true'"
+echo -e "\n"
+echo -e "Logout in."
+echo -e "Logout in how many days:"
+echo -e "\t$ snap set $SNAP_NAME LOGOUT_IN='1'"
+echo -e "\n"
+echo -e "Logout on hours."
+echo -e "Logout in how many hours:"
+echo -e "\t$ snap set $SNAP_NAME LOGOUT_ON_HOURS='9'"
+echo -e "\n"
+echo -e "Logout on minutes."
+echo -e "Logout in how many minutes:"
+echo -e "\t$ snap set $SNAP_NAME LOGOUT_ON_MINUTES='5'"
+echo -e "\n"
 # parse config file for supported settings keys
 echo -e "wekan supports settings keys"
 echo -e "values can be changed by calling\n$ snap set $SNAP_NAME <key name>='<key value>'"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index bb1f337f..b876bfbf 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -14,7 +14,20 @@ confinement: strict
 grade: stable
 
 architectures:
-  - amd64
+  - build-on: amd64
+    run-on: amd64
+
+  - build-on: i386
+    run-on: i386
+    build-error: ignore
+
+  - build-on: armhf
+    run-on: armhf
+    build-error: ignore
+
+  - build-on: arm64
+    run-on: arm64
+    build-error: ignore
 
 plugs:
   mongodb-plug:
diff --git a/start-wekan.bat b/start-wekan.bat
index 3b1e8e77..fee3e18a 100644
--- a/start-wekan.bat
+++ b/start-wekan.bat
@@ -4,175 +4,245 @@ SET MAIL_URL=smtp://user:pass@mailserver.example.com:25/
 SET MAIL_FROM=admin@example.com
 SET PORT=2000
 
-REM If you disable Wekan API with false, Export Board does not work.
+REM # If you disable Wekan API with false, Export Board does not work.
 SET WITH_API=true
 
-REM Optional: Integration with Matomo https://matomo.org that is installed to your server
-REM The address of the server where Matomo is hosted.
-REM  example: - MATOMO_ADDRESS=https://example.com/matomo
+REM # Optional: Integration with Matomo https://matomo.org that is installed to your server
+REM # The address of the server where Matomo is hosted.
+REM # example: - MATOMO_ADDRESS=https://example.com/matomo
 REM SET MATOMO_ADDRESS=
-REM  The value of the site ID given in Matomo server for Wekan
-REM  example: - MATOMO_SITE_ID=12345
+
+REM # The value of the site ID given in Matomo server for Wekan
+REM # example: - MATOMO_SITE_ID=12345
 REM SET MATOMO_SITE_ID=
-REM  The option do not track which enables users to not be tracked by matomo
-REM  example:  - MATOMO_DO_NOT_TRACK=false
+
+REM # The option do not track which enables users to not be tracked by matomo
+REM # example:  - MATOMO_DO_NOT_TRACK=false
 REM SET MATOMO_DO_NOT_TRACK=
-REM  The option that allows matomo to retrieve the username:
-REM  example: MATOMO_WITH_USERNAME=true
+
+REM # The option that allows matomo to retrieve the username:
+REM # example: MATOMO_WITH_USERNAME=true
 REM SET MATOMO_WITH_USERNAME=false
 
-REM  Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
-REM  Setting this to false is not recommended, it also disables all other browser policy protections
-REM  and allows all iframing etc. See wekan/server/policy.js
+REM # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
+REM # Setting this to false is not recommended, it also disables all other browser policy protections
+REM # and allows all iframing etc. See wekan/server/policy.js
 SET BROWSER_POLICY_ENABLED=true
-REM  When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
+
+REM # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
 REM SET TRUSTED_URL=
 
-REM  What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
-REM  example: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
+REM # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
+REM # example: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
 REM SET WEBHOOKS_ATTRIBUTES=
 
-REM  Enable the OAuth2 connection
-REM  example: OAUTH2_ENABLED=true
+REM ------------------------------------------------------------
+
+REM # Enable the OAuth2 connection
+REM # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+REM # example: OAUTH2_ENABLED=true
 REM SET OAUTH2_ENABLED=false
-REM  OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
-REM  OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345
-REM  example: OAUTH2_CLIENT_ID=abcde12345
+
+REM # OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345
+REM # example: OAUTH2_CLIENT_ID=abcde12345
 REM SET OAUTH2_CLIENT_ID=
-REM  OAuth2 Secret, for example from Rocket.Chat: Example: 54321abcde
-REM  example: OAUTH2_SECRET=54321abcde
+
+REM # OAuth2 Secret, for example from Rocket.Chat: Example: 54321abcde
+REM # example: OAUTH2_SECRET=54321abcde
 REM SET OAUTH2_SECRET=
-REM  OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com
-REM  example: OAUTH2_SERVER_URL=https://chat.example.com
+
+REM # OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com
+REM # example: OAUTH2_SERVER_URL=https://chat.example.com
 REM SET OAUTH2_SERVER_URL=
-REM  OAuth2 Authorization Endpoint. Example: /oauth/authorize
-REM  example: OAUTH2_AUTH_ENDPOINT=/oauth/authorize
+
+REM # OAuth2 Authorization Endpoint. Example: /oauth/authorize
+REM # example: OAUTH2_AUTH_ENDPOINT=/oauth/authorize
 REM SET OAUTH2_AUTH_ENDPOINT=
-REM  OAuth2 Userinfo Endpoint. Example: /oauth/userinfo
-REM  example: OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
+
+REM # OAuth2 Userinfo Endpoint. Example: /oauth/userinfo
+REM # example: OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
 REM SET OAUTH2_USERINFO_ENDPOINT=
-REM  OAuth2 Token Endpoint. Example: /oauth/token
-REM  example: OAUTH2_TOKEN_ENDPOINT=/oauth/token
+
+REM # OAuth2 Token Endpoint. Example: /oauth/token
+REM # example: OAUTH2_TOKEN_ENDPOINT=/oauth/token
 REM SET OAUTH2_TOKEN_ENDPOINT=
 
-REM  LDAP_ENABLE : Enable or not the connection by the LDAP
-REM  example : LDAP_ENABLE=true
+REM ------------------------------------------------------------
+
+REM # LDAP_ENABLE : Enable or not the connection by the LDAP
+REM # example : LDAP_ENABLE=true
 REM SET LDAP_ENABLE=false
-REM  LDAP_PORT : The port of the LDAP server
-REM  example : LDAP_PORT=389
+
+REM # LDAP_PORT : The port of the LDAP server
+REM # example : LDAP_PORT=389
 REM SET LDAP_PORT=389
-REM  LDAP_HOST : The host server for the LDAP server
-REM  example : LDAP_HOST=localhost
+
+REM # LDAP_HOST : The host server for the LDAP server
+REM # example : LDAP_HOST=localhost
 REM SET LDAP_HOST=
-REM  LDAP_BASEDN : The base DN for the LDAP Tree
-REM  example : LDAP_BASEDN=ou=user,dc=example,dc=org
+
+REM # LDAP_BASEDN : The base DN for the LDAP Tree
+REM # example : LDAP_BASEDN=ou=user,dc=example,dc=org
 REM SET LDAP_BASEDN=
-REM  LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
-REM  example : LDAP_LOGIN_FALLBACK=true
+
+REM # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
+REM # example : LDAP_LOGIN_FALLBACK=true
 REM SET LDAP_LOGIN_FALLBACK=false
-REM  LDAP_RECONNECT : Reconnect to the server if the connection is lost
-REM  example : LDAP_RECONNECT=false
+
+REM # LDAP_RECONNECT : Reconnect to the server if the connection is lost
+REM # example : LDAP_RECONNECT=false
 REM SET LDAP_RECONNECT=true
-REM  LDAP_TIMEOUT : Overall timeout, in milliseconds
-REM  example : LDAP_TIMEOUT=12345
+
+REM # LDAP_TIMEOUT : Overall timeout, in milliseconds
+REM # example : LDAP_TIMEOUT=12345
 REM SET LDAP_TIMEOUT=10000
-REM  LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
-REM  example : LDAP_IDLE_TIMEOUT=12345
+
+REM # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
+REM # example : LDAP_IDLE_TIMEOUT=12345
 REM SET LDAP_IDLE_TIMEOUT=10000
-REM  LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
-REM  example : LDAP_CONNECT_TIMEOUT=12345
+
+REM # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
+REM # example : LDAP_CONNECT_TIMEOUT=12345
 REM SET LDAP_CONNECT_TIMEOUT=10000
-REM  LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
-REM  example : LDAP_AUTHENTIFICATION=true
+
+REM # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
+REM # example : LDAP_AUTHENTIFICATION=true
 REM SET LDAP_AUTHENTIFICATION=false
-REM  LDAP_AUTHENTIFICATION_USERDN : The search user DN
-REM  example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
+
+REM # LDAP_AUTHENTIFICATION_USERDN : The search user DN
+REM # example: LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
 REM SET LDAP_AUTHENTIFICATION_USERDN=
-REM  LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
-REM  example : AUTHENTIFICATION_PASSWORD=admin
+
+REM # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
+REM # example : AUTHENTIFICATION_PASSWORD=admin
 REM SET LDAP_AUTHENTIFICATION_PASSWORD=
-REM  LDAP_LOG_ENABLED : Enable logs for the module
-REM  example : LDAP_LOG_ENABLED=true
+
+REM # LDAP_LOG_ENABLED : Enable logs for the module
+REM # example : LDAP_LOG_ENABLED=true
 REM SET LDAP_LOG_ENABLED=false
-REM  LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
-REM  example : LDAP_BACKGROUND_SYNC=true
+
+REM # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
+REM # example : LDAP_BACKGROUND_SYNC=true
 REM SET LDAP_BACKGROUND_SYNC=false
-REM  LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
-REM  example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
+
+REM # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
+REM # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
 REM SET LDAP_BACKGROUND_SYNC_INTERVAL=100
-REM  LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
-REM  example : LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
+
+REM # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
+REM # example : LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
 REM SET LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
-REM  LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
-REM  example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
+
+REM # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
+REM # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
 REM SET LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
-REM  LDAP_ENCRYPTION : If using LDAPS
-REM  example : LDAP_ENCRYPTION=ssl
+
+REM # LDAP_ENCRYPTION : If using LDAPS
+REM # example : LDAP_ENCRYPTION=ssl
 REM SET LDAP_ENCRYPTION=false
-REM  LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
-REM  example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
+
+REM # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
+REM # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
 REM SET LDAP_CA_CERT=
-REM  LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
-REM  example : LDAP_REJECT_UNAUTHORIZED=true
+
+REM # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
+REM # example : LDAP_REJECT_UNAUTHORIZED=true
 REM SET LDAP_REJECT_UNAUTHORIZED=false
-REM  LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
-REM  example : LDAP_USER_SEARCH_FILTER=
+
+REM # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
+REM # example : LDAP_USER_SEARCH_FILTER=
 REM SET LDAP_USER_SEARCH_FILTER=
-REM  LDAP_USER_SEARCH_SCOPE : base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
-REM  example : LDAP_USER_SEARCH_SCOPE=one
+
+REM # LDAP_USER_SEARCH_SCOPE : base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
+REM # example : LDAP_USER_SEARCH_SCOPE=one
 REM SET LDAP_USER_SEARCH_SCOPE=
-REM  LDAP_USER_SEARCH_FIELD : Which field is used to find the user
-REM  example : LDAP_USER_SEARCH_FIELD=uid
+
+REM # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
+REM # example : LDAP_USER_SEARCH_FIELD=uid
 REM SET LDAP_USER_SEARCH_FIELD=
-REM  LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
-REM  example : LDAP_SEARCH_PAGE_SIZE=12345
+
+REM # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
+REM # example : LDAP_SEARCH_PAGE_SIZE=12345
 REM SET LDAP_SEARCH_PAGE_SIZE=0
-REM  LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
-REM  example : LDAP_SEARCH_SIZE_LIMIT=12345
+
+REM # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
+REM #33 example : LDAP_SEARCH_SIZE_LIMIT=12345
 REM SET LDAP_SEARCH_SIZE_LIMIT=0
-REM  LDAP_GROUP_FILTER_ENABLE : Enable group filtering
-REM  example : LDAP_GROUP_FILTER_ENABLE=true
+
+REM # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
+REM # example : LDAP_GROUP_FILTER_ENABLE=true
 REM SET LDAP_GROUP_FILTER_ENABLE=false
-REM  LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
-REM  example : LDAP_GROUP_FILTER_OBJECTCLASS=group
+
+REM # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
+REM # example : LDAP_GROUP_FILTER_OBJECTCLASS=group
 REM SET LDAP_GROUP_FILTER_OBJECTCLASS=
-REM  LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
-REM  example :
+
+REM # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
+REM # example :
 REM SET LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
-REM  LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
-REM  example :
+
+REM # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
+REM # example :
 REM SET LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
-REM  LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
-REM  example :
+
+REM # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
+REM # example :
 REM SET LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
-REM  LDAP_GROUP_FILTER_GROUP_NAME :
-REM  example :
+
+REM # LDAP_GROUP_FILTER_GROUP_NAME :
+REM # example :
 REM SET LDAP_GROUP_FILTER_GROUP_NAME=
-REM  LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
-REM  example : LDAP_UNIQUE_IDENTIFIER_FIELD=guid
+
+REM # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
+REM # example : LDAP_UNIQUE_IDENTIFIER_FIELD=guid
 REM SET LDAP_UNIQUE_IDENTIFIER_FIELD=
-REM  LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
-REM  example : LDAP_UTF8_NAMES_SLUGIFY=false
+
+REM # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
+REM # example : LDAP_UTF8_NAMES_SLUGIFY=false
 REM SET LDAP_UTF8_NAMES_SLUGIFY=true
-REM  LDAP_USERNAME_FIELD : Which field contains the ldap username
-REM  example : LDAP_USERNAME_FIELD=username
+
+REM # LDAP_USERNAME_FIELD : Which field contains the ldap username
+REM # example : LDAP_USERNAME_FIELD=username
 REM SET LDAP_USERNAME_FIELD=
-REM  LDAP_MERGE_EXISTING_USERS :
-REM  example : LDAP_MERGE_EXISTING_USERS=true
+
+REM # LDAP_MERGE_EXISTING_USERS :
+REM # example : LDAP_MERGE_EXISTING_USERS=true
 REM SET LDAP_MERGE_EXISTING_USERS=false
-REM  LDAP_SYNC_USER_DATA :
-REM  example : LDAP_SYNC_USER_DATA=true
+
+REM # LDAP_SYNC_USER_DATA :
+REM # example : LDAP_SYNC_USER_DATA=true
 REM SET LDAP_SYNC_USER_DATA=false
-REM  LDAP_SYNC_USER_DATA_FIELDMAP :
-REM  example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
+
+REM # LDAP_SYNC_USER_DATA_FIELDMAP :
+REM # example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
 REM SET LDAP_SYNC_USER_DATA_FIELDMAP=
-REM  LDAP_SYNC_GROUP_ROLES :
-REM  example :
-REM SET LDAP_SYNC_GROUP_ROLES=
-REM  LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
-REM  example :
+
+REM # LDAP_SYNC_GROUP_ROLES :
+REM # example :
+REM # SET LDAP_SYNC_GROUP_ROLES=
+
+REM # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
+REM # example :
 REM SET LDAP_DEFAULT_DOMAIN=
 
+REM ------------------------------------------------
+
+REM # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
+REM # example : LOGOUT_WITH_TIMER=true
+REM SET LOGOUT_WITH_TIMER=
+
+REM # LOGOUT_IN : The number of days
+REM # example : LOGOUT_IN=1
+REM SET LOGOUT_IN=
+
+REM # LOGOUT_ON_HOURS : The number of hours
+REM # example : LOGOUT_ON_HOURS=9
+REM SET LOGOUT_ON_HOURS=
+
+REM # LOGOUT_ON_MINUTES : The number of minutes
+REM # example : LOGOUT_ON_MINUTES=55
+REM SET LOGOUT_ON_MINUTES=
+
 cd .build\bundle
 node main.js
 cd ..\..
\ No newline at end of file
diff --git a/start-wekan.sh b/start-wekan.sh
index dd8bf9eb..a7587e40 100755
--- a/start-wekan.sh
+++ b/start-wekan.sh
@@ -1,206 +1,225 @@
 #!/bin/bash
 
 function wekan_repo_check(){
-	git_remotes="$(git remote show 2>/dev/null)"
-	res=""
-	for i in $git_remotes; do
-		res="$(git remote get-url $i | sed 's/.*wekan\/wekan.*/wekan\/wekan/')"
-		if [[ "$res" == "wekan/wekan" ]]; then
-		    break
-		fi
-	done
+      git_remotes="$(git remote show 2>/dev/null)"
+      res=""
+      for i in $git_remotes; do
+            res="$(git remote get-url $i | sed 's/.*wekan\/wekan.*/wekan\/wekan/')"
+            if [[ "$res" == "wekan/wekan" ]]; then
+                break
+            fi
+      done
 
-	if [[ "$res" != "wekan/wekan" ]]; then
-		echo "$PWD is not a wekan repository"
-		exit;
-	fi
+      if [[ "$res" != "wekan/wekan" ]]; then
+            echo "$PWD is not a wekan repository"
+            exit;
+      fi
 }
 
 # If you want to restart even on crash, uncomment while and done lines.
 #while true; do
-	wekan_repo_check
-	cd .build/bundle
-	export MONGO_URL='mongodb://127.0.0.1:27019/wekan'
-	# Production: https://example.com/wekan
-	# Local: http://localhost:2000
-	#export ipaddress=$(ifdata -pa eth0)
-	export ROOT_URL='http://localhost:2000'
-	# https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
-	# https://github.com/wekan/wekan-mongodb/blob/master/docker-compose.yml
-	export MAIL_URL='smtp://user:pass@mailserver.example.com:25/'
-	#export KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011
-	# This is local port where Wekan Node.js runs, same as below on Caddyfile settings.
-	export PORT=2000
-	# Wekan Export Board works when WITH_API=true.
-	# If you disable Wekan API with false, Export Board does not work.
-	export WITH_API='true'
-	#---------------------------------------------
-	## Optional: Integration with Matomo https://matomo.org that is installed to your server
-	## The address of the server where Matomo is hosted:
-	##export MATOMO_ADDRESS=https://example.com/matomo
-	#export MATOMO_ADDRESS=
-	## The value of the site ID given in Matomo server for Wekan
-	# Example: export MATOMO_SITE_ID=123456789
-	#export MATOMO_SITE_ID=''
-	## The option do not track which enables users to not be tracked by matomo"
-	#Example: export MATOMO_DO_NOT_TRACK=false
-	#export MATOMO_DO_NOT_TRACK=true
-	## The option that allows matomo to retrieve the username:
-	# Example: export MATOMO_WITH_USERNAME=true
-	#export MATOMO_WITH_USERNAME='false'
-	# Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
-	# Setting this to false is not recommended, it also disables all other browser policy protections
-	# and allows all iframing etc. See wekan/server/policy.js
-	# Default value: true
-	export BROWSER_POLICY_ENABLED=true
-	# When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
-	# Example: export TRUSTED_URL=http://example.com
-	export TRUSTED_URL=''
-	# What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
-	# Example: export WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
-	export WEBHOOKS_ATTRIBUTES=''
-	#---------------------------------------------
-	# OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
-	# OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345
-	# example: export OAUTH2_CLIENT_ID=abcde12345
-	#export OAUTH2_CLIENT_ID=''
-	# OAuth2 Secret, for example from Rocket.Chat: Example: 54321abcde
-	# example: export OAUTH2_SECRET=54321abcde
-	#export OAUTH2_SECRET=''
-	# OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com
-	# example: export OAUTH2_SERVER_URL=https://chat.example.com
-	#export OAUTH2_SERVER_URL=''
-	# OAuth2 Authorization Endpoint. Example: /oauth/authorize
-	# example: export OAUTH2_AUTH_ENDPOINT=/oauth/authorize
-	#export OAUTH2_AUTH_ENDPOINT=''
-	# OAuth2 Userinfo Endpoint. Example: /oauth/userinfo
-	# example: export OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
-	#export OAUTH2_USERINFO_ENDPOINT=''
-	# OAuth2 Token Endpoint. Example: /oauth/token
-	# example: export OAUTH2_TOKEN_ENDPOINT=/oauth/token
-	#export OAUTH2_TOKEN_ENDPOINT=''
-	#---------------------------------------------
-	# LDAP_ENABLE : Enable or not the connection by the LDAP
-	# example :  export LDAP_ENABLE=true
-	#export LDAP_ENABLE=false
-	# LDAP_PORT : The port of the LDAP server
-	# example :  export LDAP_PORT=389
-	#export LDAP_PORT=389
-	# LDAP_HOST : The host server for the LDAP server
-	# example :  export LDAP_HOST=localhost
-	#export LDAP_HOST=
-	# LDAP_BASEDN : The base DN for the LDAP Tree
-	# example :  export LDAP_BASEDN=ou=user,dc=example,dc=org
-	#export LDAP_BASEDN=
-	# LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
-	# example :  export LDAP_LOGIN_FALLBACK=true
-	#export LDAP_LOGIN_FALLBACK=false
-	# LDAP_RECONNECT : Reconnect to the server if the connection is lost
-	# example :  export LDAP_RECONNECT=false
-	#export LDAP_RECONNECT=true
-	# LDAP_TIMEOUT : Overall timeout, in milliseconds
-	# example :  export LDAP_TIMEOUT=12345
-	#export LDAP_TIMEOUT=10000
-	# LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
-	# example :  export LDAP_IDLE_TIMEOUT=12345
-	#export LDAP_IDLE_TIMEOUT=10000
-	# LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
-	# example :  export LDAP_CONNECT_TIMEOUT=12345
-	#export LDAP_CONNECT_TIMEOUT=10000
-	# LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
-	# example :  export LDAP_AUTHENTIFICATION=true
-	#export LDAP_AUTHENTIFICATION=false
-	# LDAP_AUTHENTIFICATION_USERDN : The search user DN
-	# example :  export LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
-	#export LDAP_AUTHENTIFICATION_USERDN=
-	# LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
-	# example : AUTHENTIFICATION_PASSWORD=admin
-	#export LDAP_AUTHENTIFICATION_PASSWORD=
-	# LDAP_LOG_ENABLED : Enable logs for the module
-	# example :  export LDAP_LOG_ENABLED=true
-	#export LDAP_LOG_ENABLED=false
-	# LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
-	# example :  export LDAP_BACKGROUND_SYNC=true
-	#export LDAP_BACKGROUND_SYNC=false
-	# LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
-	# example :  export LDAP_BACKGROUND_SYNC_INTERVAL=12345
-	#export LDAP_BACKGROUND_SYNC_INTERVAL=100
-	# LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
-	# example :  export LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
-	#export LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
-	# LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
-	# example :  export LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
-	#export LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
-	# LDAP_ENCRYPTION : If using LDAPS
-	# example :  export LDAP_ENCRYPTION=ssl
-	#export LDAP_ENCRYPTION=false
-	# LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
-	# example :  export LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
-	#export LDAP_CA_CERT=
-	# LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
-	# example :  export LDAP_REJECT_UNAUTHORIZED=true
-	#export LDAP_REJECT_UNAUTHORIZED=false
-	# LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
-	# example :  export LDAP_USER_SEARCH_FILTER=
-	#export LDAP_USER_SEARCH_FILTER=
-	# LDAP_USER_SEARCH_SCOPE : base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
-	# example :  export LDAP_USER_SEARCH_SCOPE=one
-	#export LDAP_USER_SEARCH_SCOPE=
-	# LDAP_USER_SEARCH_FIELD : Which field is used to find the user
-	# example :  export LDAP_USER_SEARCH_FIELD=uid
-	#export LDAP_USER_SEARCH_FIELD=
-	# LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
-	# example :  export LDAP_SEARCH_PAGE_SIZE=12345
-	#export LDAP_SEARCH_PAGE_SIZE=0
-	# LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
-	# example :  export LDAP_SEARCH_SIZE_LIMIT=12345
-	#export LDAP_SEARCH_SIZE_LIMIT=0
-	# LDAP_GROUP_FILTER_ENABLE : Enable group filtering
-	# example :  export LDAP_GROUP_FILTER_ENABLE=true
-	#export LDAP_GROUP_FILTER_ENABLE=false
-	# LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
-	# example :  export LDAP_GROUP_FILTER_OBJECTCLASS=group
-	#export LDAP_GROUP_FILTER_OBJECTCLASS=
-	# LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
-	# example :
-	#export LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
-	# LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
-	# example :
-	#export LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
-	# LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
-	# example :
-	#export LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
-	# LDAP_GROUP_FILTER_GROUP_NAME :
-	# example :
-	#export LDAP_GROUP_FILTER_GROUP_NAME=
-	# LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
-	# example :  export LDAP_UNIQUE_IDENTIFIER_FIELD=guid
-	#export LDAP_UNIQUE_IDENTIFIER_FIELD=
-	# LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
-	# example :  export LDAP_UTF8_NAMES_SLUGIFY=false
-	#export LDAP_UTF8_NAMES_SLUGIFY=true
-	# LDAP_USERNAME_FIELD : Which field contains the ldap username
-	# example :  export LDAP_USERNAME_FIELD=username
-	#export LDAP_USERNAME_FIELD=
-	# LDAP_FULLNAME_FIELD : Which field contains the ldap fullname
-	# example :  export LDAP_FULLNAME_FIELD=fullname
-	#export LDAP_FULLNAME_FIELD=
-	# LDAP_MERGE_EXISTING_USERS :
-	# example :  export LDAP_MERGE_EXISTING_USERS=true
-	#export LDAP_MERGE_EXISTING_USERS=false
-	# LDAP_SYNC_USER_DATA :
-	# example :  export LDAP_SYNC_USER_DATA=true
-	#export LDAP_SYNC_USER_DATA=false
-	# LDAP_SYNC_USER_DATA_FIELDMAP :
-	# example :  export LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
-	#export LDAP_SYNC_USER_DATA_FIELDMAP=
-	# LDAP_SYNC_GROUP_ROLES :
-	# example :
-	#export LDAP_SYNC_GROUP_ROLES=
-	# LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
-	# example :
-	#export LDAP_DEFAULT_DOMAIN=
-	node main.js
-	# & >> ../../wekan.log
-	cd ../..
+      wekan_repo_check
+      cd .build/bundle
+      export MONGO_URL='mongodb://127.0.0.1:27019/wekan'
+      #---------------------------------------------
+      # Production: https://example.com/wekan
+      # Local: http://localhost:2000
+      #export ipaddress=$(ifdata -pa eth0)
+      export ROOT_URL='http://localhost:2000'
+      #---------------------------------------------
+      # https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
+      # https://github.com/wekan/wekan-mongodb/blob/master/docker-compose.yml
+      export MAIL_URL='smtp://user:pass@mailserver.example.com:25/'
+      #---------------------------------------------
+      #export KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011
+      #---------------------------------------------
+      # This is local port where Wekan Node.js runs, same as below on Caddyfile settings.
+      export PORT=2000
+      #---------------------------------------------
+      # Wekan Export Board works when WITH_API=true.
+      # If you disable Wekan API with false, Export Board does not work.
+      export WITH_API='true'
+      #---------------------------------------------
+      # CORS: Set Access-Control-Allow-Origin header. Example: *
+      #- CORS=*
+      #---------------------------------------------
+      ## Optional: Integration with Matomo https://matomo.org that is installed to your server
+      ## The address of the server where Matomo is hosted:
+      ##export MATOMO_ADDRESS=https://example.com/matomo
+      #export MATOMO_ADDRESS=
+      ## The value of the site ID given in Matomo server for Wekan
+      # Example: export MATOMO_SITE_ID=123456789
+      #export MATOMO_SITE_ID=''
+      ## The option do not track which enables users to not be tracked by matomo"
+      #Example: export MATOMO_DO_NOT_TRACK=false
+      #export MATOMO_DO_NOT_TRACK=true
+      ## The option that allows matomo to retrieve the username:
+      # Example: export MATOMO_WITH_USERNAME=true
+      #export MATOMO_WITH_USERNAME='false'
+      # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
+      # Setting this to false is not recommended, it also disables all other browser policy protections
+      # and allows all iframing etc. See wekan/server/policy.js
+      # Default value: true
+      export BROWSER_POLICY_ENABLED=true
+      # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
+      # Example: export TRUSTED_URL=http://example.com
+      export TRUSTED_URL=''
+      # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
+      # Example: export WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
+      export WEBHOOKS_ATTRIBUTES=''
+      #---------------------------------------------
+      # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+      # OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345
+      # example: export OAUTH2_CLIENT_ID=abcde12345
+      #export OAUTH2_CLIENT_ID=''
+      # OAuth2 Secret, for example from Rocket.Chat: Example: 54321abcde
+      # example: export OAUTH2_SECRET=54321abcde
+      #export OAUTH2_SECRET=''
+      # OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com
+      # example: export OAUTH2_SERVER_URL=https://chat.example.com
+      #export OAUTH2_SERVER_URL=''
+      # OAuth2 Authorization Endpoint. Example: /oauth/authorize
+      # example: export OAUTH2_AUTH_ENDPOINT=/oauth/authorize
+      #export OAUTH2_AUTH_ENDPOINT=''
+      # OAuth2 Userinfo Endpoint. Example: /oauth/userinfo
+      # example: export OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
+      #export OAUTH2_USERINFO_ENDPOINT=''
+      # OAuth2 Token Endpoint. Example: /oauth/token
+      # example: export OAUTH2_TOKEN_ENDPOINT=/oauth/token
+      #export OAUTH2_TOKEN_ENDPOINT=''
+      #---------------------------------------------
+      # LDAP_ENABLE : Enable or not the connection by the LDAP
+      # example :  export LDAP_ENABLE=true
+      #export LDAP_ENABLE=false
+      # LDAP_PORT : The port of the LDAP server
+      # example :  export LDAP_PORT=389
+      #export LDAP_PORT=389
+      # LDAP_HOST : The host server for the LDAP server
+      # example :  export LDAP_HOST=localhost
+      #export LDAP_HOST=
+      # LDAP_BASEDN : The base DN for the LDAP Tree
+      # example :  export LDAP_BASEDN=ou=user,dc=example,dc=org
+      #export LDAP_BASEDN=
+      # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
+      # example :  export LDAP_LOGIN_FALLBACK=true
+      #export LDAP_LOGIN_FALLBACK=false
+      # LDAP_RECONNECT : Reconnect to the server if the connection is lost
+      # example :  export LDAP_RECONNECT=false
+      #export LDAP_RECONNECT=true
+      # LDAP_TIMEOUT : Overall timeout, in milliseconds
+      # example :  export LDAP_TIMEOUT=12345
+      #export LDAP_TIMEOUT=10000
+      # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
+      # example :  export LDAP_IDLE_TIMEOUT=12345
+      #export LDAP_IDLE_TIMEOUT=10000
+      # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
+      # example :  export LDAP_CONNECT_TIMEOUT=12345
+      #export LDAP_CONNECT_TIMEOUT=10000
+      # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
+      # example :  export LDAP_AUTHENTIFICATION=true
+      #export LDAP_AUTHENTIFICATION=false
+      # LDAP_AUTHENTIFICATION_USERDN : The search user DN
+      # example :  export LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
+      #export LDAP_AUTHENTIFICATION_USERDN=
+      # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
+      # example : AUTHENTIFICATION_PASSWORD=admin
+      #export LDAP_AUTHENTIFICATION_PASSWORD=
+      # LDAP_LOG_ENABLED : Enable logs for the module
+      # example :  export LDAP_LOG_ENABLED=true
+      #export LDAP_LOG_ENABLED=false
+      # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
+      # example :  export LDAP_BACKGROUND_SYNC=true
+      #export LDAP_BACKGROUND_SYNC=false
+      # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
+      # example :  export LDAP_BACKGROUND_SYNC_INTERVAL=12345
+      #export LDAP_BACKGROUND_SYNC_INTERVAL=100
+      # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
+      # example :  export LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
+      #export LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
+      # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
+      # example :  export LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
+      #export LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
+      # LDAP_ENCRYPTION : If using LDAPS
+      # example :  export LDAP_ENCRYPTION=ssl
+      #export LDAP_ENCRYPTION=false
+      # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
+      # example :  export LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
+      #export LDAP_CA_CERT=
+      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
+      # example :  export LDAP_REJECT_UNAUTHORIZED=true
+      #export LDAP_REJECT_UNAUTHORIZED=false
+      # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
+      # example :  export LDAP_USER_SEARCH_FILTER=
+      #export LDAP_USER_SEARCH_FILTER=
+      # LDAP_USER_SEARCH_SCOPE : base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
+      # example :  export LDAP_USER_SEARCH_SCOPE=one
+      #export LDAP_USER_SEARCH_SCOPE=
+      # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
+      # example :  export LDAP_USER_SEARCH_FIELD=uid
+      #export LDAP_USER_SEARCH_FIELD=
+      # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
+      # example :  export LDAP_SEARCH_PAGE_SIZE=12345
+      #export LDAP_SEARCH_PAGE_SIZE=0
+      # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
+      # example :  export LDAP_SEARCH_SIZE_LIMIT=12345
+      #export LDAP_SEARCH_SIZE_LIMIT=0
+      # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
+      # example :  export LDAP_GROUP_FILTER_ENABLE=true
+      #export LDAP_GROUP_FILTER_ENABLE=false
+      # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
+      # example :  export LDAP_GROUP_FILTER_OBJECTCLASS=group
+      #export LDAP_GROUP_FILTER_OBJECTCLASS=
+      # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
+      # example :
+      #export LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
+      # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
+      # example :
+      #export LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
+      # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
+      # example :
+      #export LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
+      # LDAP_GROUP_FILTER_GROUP_NAME :
+      # example :
+      #export LDAP_GROUP_FILTER_GROUP_NAME=
+      # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
+      # example :  export LDAP_UNIQUE_IDENTIFIER_FIELD=guid
+      #export LDAP_UNIQUE_IDENTIFIER_FIELD=
+      # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
+      # example :  export LDAP_UTF8_NAMES_SLUGIFY=false
+      #export LDAP_UTF8_NAMES_SLUGIFY=true
+      # LDAP_USERNAME_FIELD : Which field contains the ldap username
+      # example :  export LDAP_USERNAME_FIELD=username
+      #export LDAP_USERNAME_FIELD=
+      # LDAP_FULLNAME_FIELD : Which field contains the ldap fullname
+      # example :  export LDAP_FULLNAME_FIELD=fullname
+      #export LDAP_FULLNAME_FIELD=
+      # LDAP_MERGE_EXISTING_USERS :
+      # example :  export LDAP_MERGE_EXISTING_USERS=true
+      #export LDAP_MERGE_EXISTING_USERS=false
+      # LDAP_SYNC_USER_DATA :
+      # example :  export LDAP_SYNC_USER_DATA=true
+      #export LDAP_SYNC_USER_DATA=false
+      # LDAP_SYNC_USER_DATA_FIELDMAP :
+      # example :  export LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
+      #export LDAP_SYNC_USER_DATA_FIELDMAP=
+      # LDAP_SYNC_GROUP_ROLES :
+      # example :
+      #export LDAP_SYNC_GROUP_ROLES=
+      # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
+      # example :
+      #export LDAP_DEFAULT_DOMAIN=
+      # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
+      # example : LOGOUT_WITH_TIMER=true
+      #- LOGOUT_WITH_TIMER=
+      # LOGOUT_IN : The number of days
+      # example : LOGOUT_IN=1
+      #- LOGOUT_IN=
+      #- LOGOUT_ON_HOURS=
+      # LOGOUT_ON_MINUTES : The number of minutes
+      # example : LOGOUT_ON_MINUTES=55
+      #- LOGOUT_ON_MINUTES=
+
+      node main.js
+      # & >> ../../wekan.log
+      cd ../..
 #done