diff --git a/README.md b/README.md index 408046e8..64031996 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ **The use of this software subjects you to our [Terms Of Use][3] and [Data Protection Policy][4].** -# version [1.0.2][5] +# version [1.0.3][5] ## Introduction: @@ -42,7 +42,7 @@ ___ It seems important that the file was not renamed when it was downloaded. If necessary, rename it before installing it. -- Install ![OAuth2OOo logo][17] **[OAuth2OOo.oxt][18]** extension version 1.2.0. +- Install ![OAuth2OOo logo][17] **[OAuth2OOo.oxt][18]** extension version 1.2.1. You must install this extension, if it is not already installed. @@ -50,7 +50,7 @@ You must install this extension, if it is not already installed. You must install this extension, if it is not already installed. -- Install ![vCardOOo logo][1] **[vCardOOo.oxt][21]** extension version 1.0.2. +- Install ![vCardOOo logo][1] **[vCardOOo.oxt][21]** extension version [![Version][0]][21] Restart LibreOffice / OpenOffice after installation. @@ -157,7 +157,11 @@ It will give you access to an information system that only larges companies are - Support for version **1.2.0** of the **OAuth2OOo** extension. Previous versions will not work with **OAuth2OOo** extension 1.2.0 or higher. -### What remains to be done for version 1.0.2: +### What has been done for version 1.0.3: + +- Support for version **1.2.1** of the **OAuth2OOo** extension. Previous versions will not work with **OAuth2OOo** extension 1.2.1 or higher. + +### What remains to be done for version 1.0.3: - Make the address book locally editable with replication of changes. @@ -165,6 +169,7 @@ It will give you access to an information system that only larges companies are - Anything welcome... +[0]: [1]: [2]: [3]: @@ -182,10 +187,10 @@ It will give you access to an information system that only larges companies are [15]: [16]: [17]: -[18]: +[18]: [19]: -[20]: -[21]: +[20]: +[21]: [22]: [23]: [24]: diff --git a/README_fr.md b/README_fr.md index 90fd4502..4ff5adab 100644 --- a/README_fr.md +++ b/README_fr.md @@ -4,7 +4,7 @@ **L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][3] et à notre [Politique de protection des données][4]**. -# version [1.0.2][5] +# version [1.0.3][5] ## Introduction: @@ -42,7 +42,7 @@ ___ Il semble important que le fichier n'ait pas été renommé lors de son téléchargement. Si nécessaire, renommez-le avant de l'installer. -- Installer l'extension ![OAuth2OOo logo][17] **[OAuth2OOo.oxt][18]** version 1.2.0. +- Installer l'extension ![OAuth2OOo logo][17] **[OAuth2OOo.oxt][18]** version 1.2.1. Vous devez installer cette extension, si elle n'est pas déjà installée. @@ -50,7 +50,7 @@ Vous devez installer cette extension, si elle n'est pas déjà installée. Vous devez installer cette extension, si elle n'est pas déjà installée. -- Installer l'extension ![vCardOOo logo][1] **[vCardOOo.oxt][21]** version 1.0.2. +- Installer l'extension ![vCardOOo logo][1] **[vCardOOo.oxt][21]** version [![Version][0]][21] Redémarrez LibreOffice / OpenOffice après l'installation. @@ -157,7 +157,11 @@ Elle vous donnera accès à un système d'information que seules les grandes ent - Prise en charge de la version 1.2.0 de l'extension **OAuth2OOo**. Les versions précédentes ne fonctionneront pas avec l'extension **OAuth2OOo** 1.2.0 ou ultérieure. -### Que reste-t-il à faire pour la version 1.0.2: +### Ce qui a été fait pour la version 1.0.3: + +- Prise en charge de la version 1.2.1 de l'extension **OAuth2OOo**. Les versions précédentes ne fonctionneront pas avec l'extension **OAuth2OOo** 1.2.1 ou ultérieure. + +### Que reste-t-il à faire pour la version 1.0.3: - Rendre le carnet d'adresses modifiable localement avec la réplication des modifications. @@ -165,6 +169,7 @@ Elle vous donnera accès à un système d'information que seules les grandes ent - Tout ce qui est bienvenu... +[0]: [1]: [2]: [3]: @@ -182,10 +187,10 @@ Elle vous donnera accès à un système d'information que seules les grandes ent [15]: [16]: [17]: -[18]: +[18]: [19]: -[20]: -[21]: +[20]: +[21]: [22]: [23]: [24]: diff --git a/_config.yml b/_config.yml index 9293be27..19727f6b 100644 --- a/_config.yml +++ b/_config.yml @@ -13,7 +13,7 @@ description: Your contacts from your Android phone as an HsqlDB database in Libr sidebar: - name: Download icon: - link: https://github.com/prrvchr/vCardOOo/raw/main/vCardOOo.oxt + link: https://github.com/prrvchr/vCardOOo/releases/latest/download/vCardOOo.oxt - name: Repository icon: link: https://github.com/prrvchr/vCardOOo diff --git a/source/vCardOOo/.classpath b/source/vCardOOo/.classpath deleted file mode 100644 index 7d8e64da..00000000 --- a/source/vCardOOo/.classpath +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/source/vCardOOo/.gitignore b/source/vCardOOo/.gitignore index e69e3477..522e64e8 100644 --- a/source/vCardOOo/.gitignore +++ b/source/vCardOOo/.gitignore @@ -1,3 +1,8 @@ /.settings/ /bin/ /build/ +/dist/ +.classpath +.project +.pydevproject +.unoproject diff --git a/source/vCardOOo/.project b/source/vCardOOo/.project deleted file mode 100644 index 11510fd1..00000000 --- a/source/vCardOOo/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - vCardOOo - - - - - - org.python.pydev.PyDevBuilder - - - - - org.libreoffice.ide.eclipse.core.types - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.libreoffice.ide.eclipse.core.unonature - org.eclipse.jdt.core.javanature - org.python.pydev.pythonNature - - diff --git a/source/vCardOOo/.pydevproject b/source/vCardOOo/.pydevproject deleted file mode 100644 index 2b045655..00000000 --- a/source/vCardOOo/.pydevproject +++ /dev/null @@ -1,5 +0,0 @@ - - - Default - python interpreter - diff --git a/source/vCardOOo/.unoproject b/source/vCardOOo/.unoproject deleted file mode 100644 index 1bbc7a75..00000000 --- a/source/vCardOOo/.unoproject +++ /dev/null @@ -1,12 +0,0 @@ -#UNO project configuration file -#Wed Apr 27 09:16:58 EDT 2022 -project.prefix=io.github.prrvchr -project.language=Java -project.ooo=LibreOffice 7.3 -project.idl=/idl -regclassname=io.github.prrvchr.carddav.RegistrationHandler -project.implementation=carddav -project.build=build -project.sdk=7.3.2.2 -project.srcdir=/source -javaversion=java5 diff --git a/source/vCardOOo/description.xml b/source/vCardOOo/description.xml index 8857b172..0cc88d45 100644 --- a/source/vCardOOo/description.xml +++ b/source/vCardOOo/description.xml @@ -28,7 +28,7 @@ xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - + diff --git a/source/vCardOOo/dist/.gitignore b/source/vCardOOo/dist/.gitignore deleted file mode 100644 index 9fb0b35a..00000000 --- a/source/vCardOOo/dist/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/.ooo-debug/ diff --git a/source/vCardOOo/dist/vCardOOo.oxt b/source/vCardOOo/dist/vCardOOo.oxt deleted file mode 100644 index 7bb04ea0..00000000 Binary files a/source/vCardOOo/dist/vCardOOo.oxt and /dev/null differ diff --git a/source/vCardOOo/service/Driver.py b/source/vCardOOo/service/Driver.py index 946d7dbd..e38f73c9 100644 --- a/source/vCardOOo/service/Driver.py +++ b/source/vCardOOo/service/Driver.py @@ -126,7 +126,7 @@ def connect(self, url, infos): if not username or not password: self._logSqlException(1102, username) raise self._getSqlException(113, 1102, username) - connection = self.DataSource.getConnection(scheme, server, username, password) + connection = self.DataSource.getConnection(self, scheme, server, username, password) version = self.DataSource.DataBase.Version name = connection.getMetaData().getUserName() self._logger.logprb(INFO, 'Driver', 'connect()', 114, version, name) diff --git a/source/vCardOOo/service/pythonpath/vcard/provider.py b/source/vCardOOo/service/pythonpath/vcard/provider.py index 9d42452f..4db8718a 100644 --- a/source/vCardOOo/service/pythonpath/vcard/provider.py +++ b/source/vCardOOo/service/pythonpath/vcard/provider.py @@ -201,10 +201,10 @@ def _parseAddressbookUrl(self, response): break return url - def initAddressbooks(self, database, user): + def initAddressbooks(self, source, database, user): parameter = self._getAllBookParameter(user) iterator = self._parseAllBook(user.Request.execute(parameter)) - self.initUserBooks(database, user, iterator) + self.initUserBooks(source, database, user, iterator) def initUserGroups(self, database, user, book): pass diff --git a/vCardOOo.oxt b/vCardOOo.oxt deleted file mode 100644 index 7bb04ea0..00000000 Binary files a/vCardOOo.oxt and /dev/null differ diff --git a/vCardOOo.update.xml b/vCardOOo.update.xml index 4ddd061a..d8a87c72 100644 --- a/vCardOOo.update.xml +++ b/vCardOOo.update.xml @@ -1,11 +1,36 @@ + - + - + @@ -14,7 +39,7 @@ vCardOOo - - + +