Skip to content

Commit f5f936a

Browse files
committed
Merge branch 'develop'
# Conflicts: # src/libcommonserver/utility/utility.cpp # src/libsyncengine/db/syncdb.cpp # test/libcommonserver/utility/testutility.cpp # test/libsyncengine/db/testsyncdb.cpp
2 parents faa8a6a + e9ab562 commit f5f936a

39 files changed

+479
-141
lines changed

infomaniak-build-tools/kDrive-template.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<h1>Release notes - kDrive 3.6.4</h1>
2323
<h2><b>Bug fixes</b></h2>
2424
<ul>
25-
<li>Fixed a sync issue when modification dates < 1970</li>
25+
<li>Fixed a sync issue occurring with file modification dates < 1970</li>
2626
<li>Fixed a sync issue with NFD encoded names</li>
27+
<li>Fixed sync of files with double quote in their names</li>
28+
<li>Fixed issue when trying to upload a file whose size exceedes the maximum allowed size</li>
2729
</ul>
2830
</body>
2931
</html>

release_notes/kDrive-3.6.4.20240808/kDrive-3.6.4.20240808-de.html renamed to release_notes/kDrive-3.6.4.20240814/kDrive-3.6.4.20240814-de.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<h1>Versionshinweise - kDrive 3.6.4</h1>
2323
<h2><b>Fehlerbehebungen</b></h2>
2424
<ul>
25-
<li>Ein Synchronisierungsproblem bei &Auml;nderungsdaten &lt; 1970 wurde behoben.</li>
25+
<li>Ein Problem bei der Synchronisierung von Dateien mit einem &Auml;nderungsdatum &lt; 1970 wurde behoben.</li>
2626
<li>Sync-Problem mit NFD-kodierten Namen behoben</li>
27+
<li>Synchronisierung von Dateien mit doppelten Anf&uuml;hrungszeichen in ihren Namen behoben</li>
28+
<li>Problem beim Versuch, eine Datei hochzuladen, deren Gr&ouml;&szlig;e die maximal zul&auml;ssige Gr&ouml;&szlig;e &uuml;berschreitet, behoben</li>
2729
</ul>
2830
</body>
2931
</html>

release_notes/kDrive-3.6.4.20240808/kDrive-3.6.4.20240808-linux-es.html renamed to release_notes/kDrive-3.6.4.20240814/kDrive-3.6.4.20240814-es.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<h1>Notas de la versi&oacute;n - kDrive 3.6.4</h1>
2323
<h2><b>Correcci&oacute;n de errores</b></h2>
2424
<ul>
25-
<li>Solucionado un problema de sincronizaci&oacute;n cuando las fechas de modificaci&oacute;n &lt; 1970</li>
25+
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a con fechas de modificaci&oacute;n de archivos &lt; 1970</li>
2626
<li>Se ha corregido un problema de sincronizaci&oacute;n con los nombres codificados con NFD.</li>
27+
<li>Corregida la sincronizaci&oacute;n de archivos con comillas dobles en sus nombres</li>
28+
<li>Se ha solucionado un problema al intentar cargar un archivo cuyo tama&ntilde;o supera el m&aacute;ximo permitido.</li>
2729
</ul>
2830
</body>
2931
</html>

release_notes/kDrive-3.6.4.20240808/kDrive-3.6.4.20240808-linux-fr.html renamed to release_notes/kDrive-3.6.4.20240814/kDrive-3.6.4.20240814-fr.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<h1>Notes de version - kDrive 3.6.4</h1>
2323
<h2><b>Correction de bugs</b></h2>
2424
<ul>
25-
<li>Correction d'un probl&egrave;me de synchronisation lorsque les dates de modification sont inf&eacute;rieures &agrave; 1970</li>
25+
<li>Correction d'un probl&egrave;me de synchronisation survenant avec des dates de modification de fichiers &lt; 1970</li>
2626
<li>Correction d'un probl&egrave;me de synchronisation avec les noms encod&eacute;s en NFD</li>
27+
<li>Correction de la synchronisation des fichiers dont le nom contient des guillemets doubles</li>
28+
<li>Correction d'un probl&egrave;me lors de la tentative de t&eacute;l&eacute;chargement d'un fichier dont la taille d&eacute;passe la taille maximale autoris&eacute;e</li>
2729
</ul>
2830
</body>
2931
</html>

release_notes/kDrive-3.6.4.20240808/kDrive-3.6.4.20240808-linux-it.html renamed to release_notes/kDrive-3.6.4.20240814/kDrive-3.6.4.20240814-it.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<h1>Note di rilascio - kDrive 3.6.4</h1>
2323
<h2><b>Correzioni di bug</b></h2>
2424
<ul>
25-
<li>Corretto un problema di sincronizzazione quando le date di modifica sono &lt; 1970</li>
25+
<li>Corretto un problema di sincronizzazione che si verificava con date di modifica dei file &lt; 1970</li>
2626
<li>Corretto un problema di sincronizzazione con i nomi codificati NFD</li>
27+
<li>Corretta la sincronizzazione dei file con doppie virgolette nei loro nomi</li>
28+
<li>Problema risolto quando si tenta di caricare un file le cui dimensioni superano la dimensione massima consentita</li>
2729
</ul>
2830
</body>
2931
</html>

release_notes/kDrive-3.6.4.20240808/kDrive-3.6.4.20240808-linux-de.html renamed to release_notes/kDrive-3.6.4.20240814/kDrive-3.6.4.20240814-linux-de.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<h1>Versionshinweise - kDrive 3.6.4</h1>
2323
<h2><b>Fehlerbehebungen</b></h2>
2424
<ul>
25-
<li>Ein Synchronisierungsproblem bei &Auml;nderungsdaten &lt; 1970 wurde behoben.</li>
25+
<li>Ein Problem bei der Synchronisierung von Dateien mit einem &Auml;nderungsdatum &lt; 1970 wurde behoben.</li>
2626
<li>Sync-Problem mit NFD-kodierten Namen behoben</li>
27+
<li>Synchronisierung von Dateien mit doppelten Anf&uuml;hrungszeichen in ihren Namen behoben</li>
28+
<li>Problem beim Versuch, eine Datei hochzuladen, deren Gr&ouml;&szlig;e die maximal zul&auml;ssige Gr&ouml;&szlig;e &uuml;berschreitet, behoben</li>
2729
</ul>
2830
</body>
2931
</html>

release_notes/kDrive-3.6.4.20240808/kDrive-3.6.4.20240808-es.html renamed to release_notes/kDrive-3.6.4.20240814/kDrive-3.6.4.20240814-linux-es.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<h1>Notas de la versi&oacute;n - kDrive 3.6.4</h1>
2323
<h2><b>Correcci&oacute;n de errores</b></h2>
2424
<ul>
25-
<li>Solucionado un problema de sincronizaci&oacute;n cuando las fechas de modificaci&oacute;n &lt; 1970</li>
25+
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a con fechas de modificaci&oacute;n de archivos &lt; 1970</li>
2626
<li>Se ha corregido un problema de sincronizaci&oacute;n con los nombres codificados con NFD.</li>
27+
<li>Corregida la sincronizaci&oacute;n de archivos con comillas dobles en sus nombres</li>
28+
<li>Se ha solucionado un problema al intentar cargar un archivo cuyo tama&ntilde;o supera el m&aacute;ximo permitido.</li>
2729
</ul>
2830
</body>
2931
</html>

release_notes/kDrive-3.6.4.20240808/kDrive-3.6.4.20240808-win-fr.html renamed to release_notes/kDrive-3.6.4.20240814/kDrive-3.6.4.20240814-linux-fr.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<h1>Notes de version - kDrive 3.6.4</h1>
2323
<h2><b>Correction de bugs</b></h2>
2424
<ul>
25-
<li>Correction d'un probl&egrave;me de synchronisation lorsque les dates de modification sont inf&eacute;rieures &agrave; 1970</li>
25+
<li>Correction d'un probl&egrave;me de synchronisation survenant avec des dates de modification de fichiers &lt; 1970</li>
2626
<li>Correction d'un probl&egrave;me de synchronisation avec les noms encod&eacute;s en NFD</li>
27+
<li>Correction de la synchronisation des fichiers dont le nom contient des guillemets doubles</li>
28+
<li>Correction d'un probl&egrave;me lors de la tentative de t&eacute;l&eacute;chargement d'un fichier dont la taille d&eacute;passe la taille maximale autoris&eacute;e</li>
2729
</ul>
2830
</body>
2931
</html>

release_notes/kDrive-3.6.4.20240808/kDrive-3.6.4.20240808-win-it.html renamed to release_notes/kDrive-3.6.4.20240814/kDrive-3.6.4.20240814-linux-it.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<h1>Note di rilascio - kDrive 3.6.4</h1>
2323
<h2><b>Correzioni di bug</b></h2>
2424
<ul>
25-
<li>Corretto un problema di sincronizzazione quando le date di modifica sono &lt; 1970</li>
25+
<li>Corretto un problema di sincronizzazione che si verificava con date di modifica dei file &lt; 1970</li>
2626
<li>Corretto un problema di sincronizzazione con i nomi codificati NFD</li>
27+
<li>Corretta la sincronizzazione dei file con doppie virgolette nei loro nomi</li>
28+
<li>Problema risolto quando si tenta di caricare un file le cui dimensioni superano la dimensione massima consentita</li>
2729
</ul>
2830
</body>
2931
</html>

release_notes/kDrive-3.6.4.20240808/kDrive-3.6.4.20240808-linux.html renamed to release_notes/kDrive-3.6.4.20240814/kDrive-3.6.4.20240814-linux.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<h1>Release notes - kDrive 3.6.4</h1>
2323
<h2><b>Bug fixes</b></h2>
2424
<ul>
25-
<li>Fixed a sync issue when modification dates < 1970</li>
25+
<li>Fixed a sync issue occurring with file modification dates < 1970</li>
2626
<li>Fixed a sync issue with NFD encoded names</li>
27+
<li>Fixed sync of files with double quote in their names</li>
28+
<li>Fixed issue when trying to upload a file whose size exceedes the maximum allowed size</li>
2729
</ul>
2830
</body>
2931
</html>

0 commit comments

Comments
 (0)