From 7325a18cd224e3f0c6c00aa4da160604389df1f7 Mon Sep 17 00:00:00 2001 From: prrvchr Date: Sat, 26 Oct 2024 19:51:00 +0200 Subject: [PATCH] new version 1.1.6 --- .github/workflows/fascan.yml | 3 ++- README.md | 13 +++++++++---- README_fr.md | 13 +++++++++---- _fascan.yml | 2 +- source/vCardOOo/dialogs/OptionWindow.xdl | 10 +++++----- .../dialogs/OptionWindow_fr_FR.properties | 4 ++-- source/vCardOOo/service/OptionsHandler.py | 2 +- uno/dialog/card/OptionsDialog.xdl | 16 ++++++++-------- vCardOOo.update.xml | 6 +++--- 9 files changed, 40 insertions(+), 29 deletions(-) diff --git a/.github/workflows/fascan.yml b/.github/workflows/fascan.yml index 2a3bf8c6..b5656dfc 100644 --- a/.github/workflows/fascan.yml +++ b/.github/workflows/fascan.yml @@ -26,5 +26,6 @@ jobs: run: | git config user.name github-actions git config user.email github-actions@github.com - git commit -am "Fluid-Attacks Results.csv commit" || exit 0 + git commit -am "Fluid-Attacks-Results.csv commit" || exit 0 git push + exit 1 diff --git a/README.md b/README.md index 70f553a5..6a0a64cd 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ **The use of this software subjects you to our [Terms Of Use][4] and [Data Protection Policy][5].** -# version [1.1.5][6] +# version [1.1.6][6] ## Introduction: @@ -264,7 +264,12 @@ It will give you access to an information system that only larges companies are - Changes to extension options that require a restart of LibreOffice will result in a message being displayed. - Support for LibreOffice version 24.8.x. -### What remains to be done for version 1.1.5: +### What has been done for version 1.1.6: + +- The extension will ask you to install the OAuth2OOo and jdbcDriverOOo extensions in versions 1.3.8 and 1.4.6 respectively minimum. +- Modification of the extension options accessible via: **Tools -> Options... -> Internet -> vCardOOo** in order to comply with the new graphic charter. + +### What remains to be done for version 1.1.6: - Make the address book locally editable with replication of changes. @@ -277,7 +282,7 @@ It will give you access to an information system that only larges companies are [3]: [4]: [5]: -[6]: +[6]: [7]: [8]: [9]: @@ -298,7 +303,7 @@ It will give you access to an information system that only larges companies are [24]: [25]: [26]: -[27]: +[27]: [28]: [29]: [30]: diff --git a/README_fr.md b/README_fr.md index 1964bd10..c4be300c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ **L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4] et à notre [Politique de protection des données][5]**. -# version [1.1.5][6] +# version [1.1.6][6] ## Introduction: @@ -264,7 +264,12 @@ Elle vous donnera accès à un système d'information que seules les grandes ent - Les modifications apportées aux options de l'extension, qui nécessitent un redémarrage de LibreOffice, entraîneront l'affichage d'un message. - Support de LibreOffice version 24.8.x. -### Que reste-t-il à faire pour la version 1.1.5: +### Ce qui a été fait pour la version 1.1.6: + +- L'extension vous demandera d'installer les extensions OAuth2OOo et jdbcDriverOOo en version respectivement 1.3.8 et 1.4.6 minimum. +- Modification des options de l'extension accessibles via : **Outils -> Options... -> Internet -> vCardOOo** afin de respecter la nouvelle charte graphique. + +### Que reste-t-il à faire pour la version 1.1.6: - Rendre le carnet d'adresses modifiable localement avec la réplication des modifications. @@ -277,7 +282,7 @@ Elle vous donnera accès à un système d'information que seules les grandes ent [3]: [4]: [5]: -[6]: +[6]: [7]: [8]: [9]: @@ -298,7 +303,7 @@ Elle vous donnera accès à un système d'information que seules les grandes ent [24]: [25]: [26]: -[27]: +[27]: [28]: [29]: [30]: diff --git a/_fascan.yml b/_fascan.yml index a138d356..9398ac88 100644 --- a/_fascan.yml +++ b/_fascan.yml @@ -12,4 +12,4 @@ sca: include: - . language: EN -strict: true +strict: false diff --git a/source/vCardOOo/dialogs/OptionWindow.xdl b/source/vCardOOo/dialogs/OptionWindow.xdl index e2441ba6..3d04f01c 100644 --- a/source/vCardOOo/dialogs/OptionWindow.xdl +++ b/source/vCardOOo/dialogs/OptionWindow.xdl @@ -5,13 +5,13 @@ - - - + + + - - + + diff --git a/source/vCardOOo/dialogs/OptionWindow_fr_FR.properties b/source/vCardOOo/dialogs/OptionWindow_fr_FR.properties index aba7601b..a7ed567d 100644 --- a/source/vCardOOo/dialogs/OptionWindow_fr_FR.properties +++ b/source/vCardOOo/dialogs/OptionWindow_fr_FR.properties @@ -1,7 +1,7 @@ OptionWindow.HelpText= OptionWindow.Title= -OptionsDialog.FixedLine1.HelpText= -OptionsDialog.FixedLine1.Label=vCardOOo BASIC macro +OptionWindow.FixedLine1.HelpText= +OptionWindow.FixedLine1.Label=vCardOOo BASIC macro OptionWindow.Label1.HelpText= OptionWindow.Label1.Label=Lancer la macro: OptionWindow.CommandButton1.HelpText= diff --git a/source/vCardOOo/service/OptionsHandler.py b/source/vCardOOo/service/OptionsHandler.py index 060d6638..236f6216 100644 --- a/source/vCardOOo/service/OptionsHandler.py +++ b/source/vCardOOo/service/OptionsHandler.py @@ -62,7 +62,7 @@ def callHandlerMethod(self, window, event, method): handled = False if method == 'external_event': if event == 'initialize': - self._manager = OptionManager(self._ctx, window, self._logger, 65) + self._manager = OptionManager(self._ctx, window, self._logger, 61) handled = True elif event == 'ok': self._manager.saveSetting() diff --git a/uno/dialog/card/OptionsDialog.xdl b/uno/dialog/card/OptionsDialog.xdl index ebac3cd8..42765b61 100644 --- a/uno/dialog/card/OptionsDialog.xdl +++ b/uno/dialog/card/OptionsDialog.xdl @@ -5,15 +5,15 @@ - - - - - + + + + + - - - + + + diff --git a/vCardOOo.update.xml b/vCardOOo.update.xml index 456d0db7..b0839ffe 100644 --- a/vCardOOo.update.xml +++ b/vCardOOo.update.xml @@ -28,7 +28,7 @@ xmlns="http://openoffice.org/extensions/update/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - + @@ -40,7 +40,7 @@ vCardOOo - - + +