Skip to content

Commit cc0906f

Browse files
Merge pull request #695 from Infomaniak/merge-of-release-3.6.11-into-main
Merge of branch release-3.6.11 into main
2 parents b28cbba + b379b25 commit cc0906f

18 files changed

+428
-16
lines changed

VERSION.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set( KDRIVE_VERSION_MAJOR 3 )
22
set( KDRIVE_VERSION_MINOR 6 )
3-
set( KDRIVE_VERSION_PATCH 10 )
3+
set( KDRIVE_VERSION_PATCH 11 )
44
set( KDRIVE_VERSION_YEAR 2025 )
55
set( KDRIVE_SOVERSION 0 )
66

infomaniak-build-tools/kDrive-template.html

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,10 @@
1919
<!DOCTYPE html>
2020
<html>
2121
<body>
22-
<h1>Release notes - kDrive 3.6.10</h1>
22+
<h1>Release notes - kDrive 3.6.11</h1>
2323
<h2><b>Bug fixes</b></h2>
2424
<ul>
25-
<li>Fixed a bug leading to file duplication in case of access error.</li>
26-
<li>Fixed a crash that may occur during conflict resolution.</li>
27-
<li>Fixed a bug allowing to free the space occupied a file although it is not yet synchronized.</li>
28-
<li>Fixed a bug where the sync might remain stuck after pausing it.</li>
29-
<li>Improved the management of access denied errors.</li>
30-
<li>Improved user experience for sending logs.</li>
31-
<li>macOS - Improved German translation in installer.</li>
32-
<li>macOS - Fixed a bug which makes the synchronization loop when renaming a file or a directory while only changing the type case.</li>
33-
<li>linux - Fixed a bug where new changes were not synchronized if a parent folder had been moved.</li>
34-
<li>win - Fixed a bug which could cause some remotely created files to be blacklisted when LiteSync was enabled.</li>
25+
<li>Fixed wrong online status assigned to hydrated local items that are renamed by the user.</li>
3526
</ul>
3627
</body>
3728
</html>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!--
2+
~ Infomaniak kDrive - Desktop
3+
~ Copyright (C) 2023-2025 Infomaniak Network SA
4+
~
5+
~ This program is free software: you can redistribute it and/or modify
6+
~ it under the terms of the GNU General Public License as published by
7+
~ the Free Software Foundation, either version 3 of the License, or
8+
~ (at your option) any later version.
9+
~
10+
~ This program is distributed in the hope that it will be useful,
11+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
~ GNU General Public License for more details.
14+
~
15+
~ You should have received a copy of the GNU General Public License
16+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
-->
18+
19+
<!DOCTYPE html>
20+
<html>
21+
<body>
22+
<h1>Versionshinweise - kDrive 3.6.11</h1>
23+
<h2><b>Fehlerbehebungen</b></h2>
24+
<ul>
25+
<li>Es wurde ein falscher Online-Status f&uuml;r hydrierte lokale Objekte behoben, die vom Benutzer umbenannt wurden.</li>
26+
</ul>
27+
</body>
28+
</html>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!--
2+
~ Infomaniak kDrive - Desktop
3+
~ Copyright (C) 2023-2025 Infomaniak Network SA
4+
~
5+
~ This program is free software: you can redistribute it and/or modify
6+
~ it under the terms of the GNU General Public License as published by
7+
~ the Free Software Foundation, either version 3 of the License, or
8+
~ (at your option) any later version.
9+
~
10+
~ This program is distributed in the hope that it will be useful,
11+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
~ GNU General Public License for more details.
14+
~
15+
~ You should have received a copy of the GNU General Public License
16+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
-->
18+
19+
<!DOCTYPE html>
20+
<html>
21+
<body>
22+
<h1>Release notes - kDrive 3.6.11</h1>
23+
<h2><b>Bug fixes</b></h2>
24+
<ul>
25+
<li>Fixed wrong online status assigned to hydrated local items that are renamed by the user.</li>
26+
</ul>
27+
</body>
28+
</html>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!--
2+
~ Infomaniak kDrive - Desktop
3+
~ Copyright (C) 2023-2025 Infomaniak Network SA
4+
~
5+
~ This program is free software: you can redistribute it and/or modify
6+
~ it under the terms of the GNU General Public License as published by
7+
~ the Free Software Foundation, either version 3 of the License, or
8+
~ (at your option) any later version.
9+
~
10+
~ This program is distributed in the hope that it will be useful,
11+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
~ GNU General Public License for more details.
14+
~
15+
~ You should have received a copy of the GNU General Public License
16+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
-->
18+
19+
<!DOCTYPE html>
20+
<html>
21+
<body>
22+
<h1>Notas de la versi&oacute;n - kDrive 3.6.11</h1>
23+
<h2><b>Correcci&oacute;n de errores</b></h2>
24+
<ul>
25+
<li>Se ha corregido el estado en l&iacute;nea err&oacute;neo asignado a los elementos locales hidratados cuyo nombre ha cambiado el usuario.</li>
26+
</ul>
27+
</body>
28+
</html>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!--
2+
~ Infomaniak kDrive - Desktop
3+
~ Copyright (C) 2023-2025 Infomaniak Network SA
4+
~
5+
~ This program is free software: you can redistribute it and/or modify
6+
~ it under the terms of the GNU General Public License as published by
7+
~ the Free Software Foundation, either version 3 of the License, or
8+
~ (at your option) any later version.
9+
~
10+
~ This program is distributed in the hope that it will be useful,
11+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
~ GNU General Public License for more details.
14+
~
15+
~ You should have received a copy of the GNU General Public License
16+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
-->
18+
19+
<!DOCTYPE html>
20+
<html>
21+
<body>
22+
<h1>Notes de version - kDrive 3.6.11</h1>
23+
<h2><b>Correction de bugs</b></h2>
24+
<ul>
25+
<li>Correction du statut en ligne erron&eacute; attribu&eacute; aux &eacute;l&eacute;ments locaux hydrat&eacute;s qui sont renomm&eacute;s par l'utilisateur.</li>
26+
</ul>
27+
</body>
28+
</html>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!--
2+
~ Infomaniak kDrive - Desktop
3+
~ Copyright (C) 2023-2025 Infomaniak Network SA
4+
~
5+
~ This program is free software: you can redistribute it and/or modify
6+
~ it under the terms of the GNU General Public License as published by
7+
~ the Free Software Foundation, either version 3 of the License, or
8+
~ (at your option) any later version.
9+
~
10+
~ This program is distributed in the hope that it will be useful,
11+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
~ GNU General Public License for more details.
14+
~
15+
~ You should have received a copy of the GNU General Public License
16+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
-->
18+
19+
<!DOCTYPE html>
20+
<html>
21+
<body>
22+
<h1>Note di rilascio - kDrive 3.6.11</h1>
23+
<h2><b>Correzioni di bug</b></h2>
24+
<ul>
25+
<li>Corretto lo stato online errato assegnato agli elementi locali idratati che vengono rinominati dall'utente.</li>
26+
</ul>
27+
</body>
28+
</html>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!--
2+
~ Infomaniak kDrive - Desktop
3+
~ Copyright (C) 2023-2025 Infomaniak Network SA
4+
~
5+
~ This program is free software: you can redistribute it and/or modify
6+
~ it under the terms of the GNU General Public License as published by
7+
~ the Free Software Foundation, either version 3 of the License, or
8+
~ (at your option) any later version.
9+
~
10+
~ This program is distributed in the hope that it will be useful,
11+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
~ GNU General Public License for more details.
14+
~
15+
~ You should have received a copy of the GNU General Public License
16+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
-->
18+
19+
<!DOCTYPE html>
20+
<html>
21+
<body>
22+
<h1>Versionshinweise - kDrive 3.6.11</h1>
23+
<h2><b>Fehlerbehebungen</b></h2>
24+
<ul>
25+
<li>Es wurde ein falscher Online-Status f&uuml;r hydrierte lokale Objekte behoben, die vom Benutzer umbenannt wurden.</li>
26+
</ul>
27+
</body>
28+
</html>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!--
2+
~ Infomaniak kDrive - Desktop
3+
~ Copyright (C) 2023-2025 Infomaniak Network SA
4+
~
5+
~ This program is free software: you can redistribute it and/or modify
6+
~ it under the terms of the GNU General Public License as published by
7+
~ the Free Software Foundation, either version 3 of the License, or
8+
~ (at your option) any later version.
9+
~
10+
~ This program is distributed in the hope that it will be useful,
11+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
~ GNU General Public License for more details.
14+
~
15+
~ You should have received a copy of the GNU General Public License
16+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
-->
18+
19+
<!DOCTYPE html>
20+
<html>
21+
<body>
22+
<h1>Release notes - kDrive 3.6.11</h1>
23+
<h2><b>Bug fixes</b></h2>
24+
<ul>
25+
<li>Fixed wrong online status assigned to hydrated local items that are renamed by the user.</li>
26+
</ul>
27+
</body>
28+
</html>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!--
2+
~ Infomaniak kDrive - Desktop
3+
~ Copyright (C) 2023-2025 Infomaniak Network SA
4+
~
5+
~ This program is free software: you can redistribute it and/or modify
6+
~ it under the terms of the GNU General Public License as published by
7+
~ the Free Software Foundation, either version 3 of the License, or
8+
~ (at your option) any later version.
9+
~
10+
~ This program is distributed in the hope that it will be useful,
11+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
~ GNU General Public License for more details.
14+
~
15+
~ You should have received a copy of the GNU General Public License
16+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
-->
18+
19+
<!DOCTYPE html>
20+
<html>
21+
<body>
22+
<h1>Notas de la versi&oacute;n - kDrive 3.6.11</h1>
23+
<h2><b>Correcci&oacute;n de errores</b></h2>
24+
<ul>
25+
<li>Se ha corregido el estado en l&iacute;nea err&oacute;neo asignado a los elementos locales hidratados cuyo nombre ha cambiado el usuario.</li>
26+
</ul>
27+
</body>
28+
</html>

0 commit comments

Comments
 (0)