From 737e70f738fcc42f5e3c2325bbbc80b6f71f8d77 Mon Sep 17 00:00:00 2001 From: Vincent LAURENT Date: Tue, 30 Jul 2024 18:27:10 +0200 Subject: [PATCH 1/3] Don't remove hash on modal close --- public/js/signature.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/public/js/signature.js b/public/js/signature.js index d4b452f..ab0e9ec 100644 --- a/public/js/signature.js +++ b/public/js/signature.js @@ -1033,22 +1033,12 @@ var modalSharing = function() { let modalInformationsEl = document.getElementById('modal-share-informations'); let modalInformations = bootstrap.Modal.getOrCreateInstance(modalInformationsEl); modalInformations.show(); - modalInformationsEl.addEventListener('hidden.bs.modal', function (event) { - if(window.location.hash) { - history.pushState({}, '', window.location.href.replace(/#.*$/, '')); - } - }) } if(openModal == 'signed') { let modalSignedEl = document.getElementById('modal-signed'); let modalSigned = bootstrap.Modal.getOrCreateInstance(modalSignedEl); modalSigned.show(); - modalSignedEl.addEventListener('hidden.bs.modal', function (event) { - if(window.location.hash) { - history.pushState({}, '', window.location.href.replace(/#.*$/, '')); - } - }) } } From 34e5685fbbd0dcbd68c479e0d5e1bcd20eb9e1f8 Mon Sep 17 00:00:00 2001 From: Vincent LAURENT Date: Tue, 30 Jul 2024 18:39:53 +0200 Subject: [PATCH 2/3] Deploy docker file with pdf encryption --- Dockerfile | 3 ++- config/config.ini.tpl | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b13ff1a..8c33334 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,11 @@ ENV MAX_FILE_UPLOADS=201 ENV PDF_STORAGE_PATH=/data ENV DISABLE_ORGANIZATION=false ENV DEFAULT_LANGUAGE=fr_FR.UTF-8 +ENV PDF_STORAGE_ENCRYPTION=true RUN apt update && \ apt install -y vim locales gettext-base librsvg2-bin pdftk imagemagick potrace ghostscript && \ - docker-php-ext-install gettext && \ + docker-php-ext-install gettext gpg && \ rm -rf /var/lib/apt/lists/* COPY . /usr/local/signaturepdf diff --git a/config/config.ini.tpl b/config/config.ini.tpl index d515b99..9c089d9 100644 --- a/config/config.ini.tpl +++ b/config/config.ini.tpl @@ -9,3 +9,6 @@ DISABLE_ORGANIZATION=${DISABLE_ORGANIZATION} ; Manage demo link pdf : true (by default, show), false (hide), or custom link PDF_DEMO_LINK=${PDF_DEMO_LINK} + +; Encryption activation (default activation if GPG is installed) +PDF_STORAGE_ENCRYPTION=${PDF_STORAGE_ENCRYPTION} From 89f36ec63deca465bd5a340ff34e5041f87a61c8 Mon Sep 17 00:00:00 2001 From: Vincent LAURENT Date: Tue, 30 Jul 2024 18:46:30 +0200 Subject: [PATCH 3/3] Nopuvelle chaine de traduction --- locale/application.pot | 8 +++++++- locale/ar/LC_MESSAGES/application.po | 8 +++++++- locale/br/LC_MESSAGES/application.po | 8 +++++++- locale/de/LC_MESSAGES/application.po | 8 +++++++- locale/fr/LC_MESSAGES/application.po | 8 +++++++- locale/it/LC_MESSAGES/application.po | 8 +++++++- locale/kab/LC_MESSAGES/application.po | 8 +++++++- locale/oc/LC_MESSAGES/application.po | 8 +++++++- locale/ro/LC_MESSAGES/application.po | 8 +++++++- locale/tr/LC_MESSAGES/application.po | 8 +++++++- 10 files changed, 70 insertions(+), 10 deletions(-) diff --git a/locale/application.pot b/locale/application.pot index e0baa27..a0c36c2 100644 --- a/locale/application.pot +++ b/locale/application.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-26 22:54+0100\n" +"POT-Creation-Date: 2024-07-30 18:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -246,6 +246,9 @@ msgstr "" msgid "This PDF is shared with others to be signed by multiple people" msgstr "" +msgid "This PDF is stored encrypted on the server." +msgstr "" + msgid "Keep the selection active" msgstr "" @@ -365,6 +368,9 @@ msgstr "" msgid "after the last signature." msgstr "" +msgid "The PDF will be stored encrypted on the server" +msgstr "" + #, php-format msgid "%s Start sharing" msgstr "" diff --git a/locale/ar/LC_MESSAGES/application.po b/locale/ar/LC_MESSAGES/application.po index d202e87..b616dd0 100644 --- a/locale/ar/LC_MESSAGES/application.po +++ b/locale/ar/LC_MESSAGES/application.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-08 23:02+0100\n" +"POT-Creation-Date: 2024-07-30 18:44+0200\n" "PO-Revision-Date: 2023-11-18 05:03+0000\n" "Last-Translator: ButterflyOfFire \n" "Language-Team: Arabic \n" "Language-Team: German \n" "Language-Team: French \n" "Language-Team: Italian \n" "Language-Team: Kabyle \n" "Language-Team: Occitan \n" "Language-Team: Romanian \n" "Language-Team: Turkish