From 78e9e77b9ae63145f9d01f3593c721afcd4636d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Tarot=20=28=40silopolis=29?= Date: Thu, 30 Mar 2023 12:31:43 +0200 Subject: [PATCH 1/2] chore(git): Add VSCode *.code-workspace files to gitignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Tarot (@silopolis) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5845018f9c9df..de380d992bb10 100644 --- a/.gitignore +++ b/.gitignore @@ -96,6 +96,7 @@ nbproject # vscode .vscode +*.code-workspace # geany *.geany From 0cdf8baed83f38de82fddf0408e7c78fb220067c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Tarot=20=28=40silopolis=29?= Date: Thu, 30 Mar 2023 12:57:49 +0200 Subject: [PATCH 2/2] fix(text): Fix small typo in app description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Tarot (@silopolis) --- apps/encryption/appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml index 15e95ee475afc..e77261c471207 100644 --- a/apps/encryption/appinfo/info.xml +++ b/apps/encryption/appinfo/info.xml @@ -6,7 +6,7 @@ Default encryption module for server-side encryption In order to use this encryption module you need to enable server-side encryption in the admin settings. Once enabled this module will encrypt all your files transparently. The encryption is based on AES 256 keys. -The module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to a unencrypted system. +The module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system. Please read the documentation to know all implications before you decide to enable server-side encryption. 2.15.0