1
0
Fork 0
Commit Graph

16343 Commits

Author SHA1 Message Date
Matthieu Gallien bd337320e3
Merge pull request #3482 from nextcloud/bump-version-3.2.3
Bump versio to 3.2.3
2021-06-24 12:04:33 +02:00
Felix Weilbach 8b6c86a305 Bump versio to 3.2.3
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-06-24 12:01:34 +02:00
Nextcloud bot 81e3474f84
[tx-robot] updated from transifex 2021-06-24 03:53:10 +00:00
Nextcloud bot 9b8b1bf5c8
[tx-robot] updated from transifex 2021-06-23 03:53:53 +00:00
Nextcloud bot 385468d4b2
[tx-robot] updated from transifex 2021-06-22 03:55:27 +00:00
Felix Weilbach 4585411400
Merge pull request #3466 from nextcloud/backport/3395/stable-3.2
[stable-3.2] Generate png icons with inkscape
2021-06-21 13:38:57 +02:00
Felix Weilbach 1f3e1dce1c Generate application png icons from svg icons
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-06-21 12:13:02 +02:00
Felix Weilbach cdb2647cbf Remove conditional logic for OEM.cmake
This file is not used in Brander and in the desktop client and just
confused people.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-06-21 07:22:13 +00:00
Nextcloud bot 871b07ca70
[tx-robot] updated from transifex 2021-06-21 03:57:01 +00:00
Nextcloud bot 9ce279b68a
[tx-robot] updated from transifex 2021-06-20 03:57:09 +00:00
Nextcloud bot b009c287c4
[tx-robot] updated from transifex 2021-06-19 04:19:56 +00:00
Felix Weilbach 4bbd96de14
Merge pull request #3453 from nextcloud/backport/3420/stable-3.2
[stable-3.2] Cfapi: Make sure no data is transfered after cancellation
2021-06-18 15:22:53 +02:00
Felix Weilbach aa5c1837fc Cfapi: Make sure no data is transfered after cancellation
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-06-18 07:12:52 +00:00
Nextcloud bot e44d6555fa
[tx-robot] updated from transifex 2021-06-18 04:00:57 +00:00
Nextcloud bot ad5d8430e9
[tx-robot] updated from transifex 2021-06-17 03:58:12 +00:00
Nextcloud bot 5743354315
[tx-robot] updated from transifex 2021-06-16 03:56:32 +00:00
Felix Weilbach a79d9f58ca
Merge pull request #3439 from nextcloud/backport/3432/stable-3.2
[stable-3.2] Set pin state correct after rename
2021-06-14 16:40:42 +02:00
Felix Weilbach 958e4e08d9 Mark placeholder in sync after updating the placeholder
Fixes #3403 #3082 #3391

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-06-14 14:11:39 +00:00
Nextcloud bot edf1615942
[tx-robot] updated from transifex 2021-06-14 03:54:57 +00:00
Nextcloud bot 60f66a63ae
[tx-robot] updated from transifex 2021-06-13 03:55:18 +00:00
Nextcloud bot e9749e31a4
[tx-robot] updated from transifex 2021-06-12 03:56:05 +00:00
Nextcloud bot 678466109f
[tx-robot] updated from transifex 2021-06-11 04:01:23 +00:00
Nextcloud bot 490d682934
[tx-robot] updated from transifex 2021-06-10 04:12:03 +00:00
Nextcloud bot 1bcf989189
[tx-robot] updated from transifex 2021-06-09 04:00:44 +00:00
allexzander 33fc880b44
Merge pull request #3415 from nextcloud/backport/3390/stable-3.2
[stable-3.2] VFS freeze fix. Treat .sync-exclude.lst as a non-virtual file always.
2021-06-08 14:55:00 +03:00
allexzander 83e5d2025b Fix review comments.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-06-08 10:25:45 +00:00
allexzander 8ca35d977e Fix review comments.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-06-08 10:25:45 +00:00
allexzander 9bd0af6ef2 Fix review comments. Also consider exclude.lst.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-06-08 10:25:45 +00:00
allexzander 29da163107 VFS freeze fix. Treat .sync-exclude.lst as a non-virtual file always.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-06-08 10:25:45 +00:00
Nextcloud bot f027f7c9f9
[tx-robot] updated from transifex 2021-06-08 04:01:59 +00:00
allexzander f3b8d29bc7
Merge pull request #3359 from nextcloud/backport/3290/stable-3.2
[stable-3.2] Temporary! Windows. VFS. Block Virtual Files for partition root sync folders.
2021-06-07 18:06:53 +03:00
allexzander 16a58db75d Temporary! Windows. VFS. Block Virtual Files for partition root sync folders.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-06-07 14:14:16 +00:00
Nextcloud bot 22c3ce1c1e
[tx-robot] updated from transifex 2021-06-06 03:59:35 +00:00
Nextcloud bot 1646e7b461
[tx-robot] updated from transifex 2021-06-05 04:02:26 +00:00
Nextcloud bot f53d24a703
[tx-robot] updated from transifex 2021-06-04 04:06:55 +00:00
Nextcloud bot fb260d6560
[tx-robot] updated from transifex 2021-06-02 04:01:16 +00:00
Matthieu Gallien 4658c0ba84
Merge pull request #3375 from nextcloud/backport/3311/stable-3.2
[stable-3.2] Add remote folder prefix for renaming in a non-root local folder.
2021-06-01 15:13:03 +02:00
allexzander 0d77d7d850 Add remote folder prefix for renaming in a non-root local folder.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-06-01 11:50:28 +00:00
Nextcloud bot 24f80f14bd
[tx-robot] updated from transifex 2021-06-01 04:00:53 +00:00
Nextcloud bot 095ca9e6d2
[tx-robot] updated from transifex 2021-05-30 03:59:03 +00:00
Nextcloud bot 35cb8dac79
[tx-robot] updated from transifex 2021-05-29 04:15:37 +00:00
Nextcloud bot cd682817cb
[tx-robot] updated from transifex 2021-05-28 04:02:42 +00:00
Matthieu Gallien 04afaa1fe6
Merge pull request #3373 from nextcloud/bump-version-3.2.2
Bump version to 3.2.2
2021-05-27 14:18:17 +02:00
Felix Weilbach 60f3b7781e Bump version to 3.2.2
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-05-27 14:14:50 +02:00
Nextcloud bot c626033445
[tx-robot] updated from transifex 2021-05-27 04:00:48 +00:00
Nextcloud bot 76687ce8fd
[tx-robot] updated from transifex 2021-05-26 04:04:32 +00:00
allexzander 7c987281cc
Merge pull request #3357 from nextcloud/backport/3239/stable-3.2
[stable-3.2] VFS. Display local file name clash error when syncing in VFS mode.
2021-05-25 14:27:17 +03:00
allexzander 91dd481f1a VFS. Display local file name clash error when syncing in VFS mode.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-05-25 10:34:35 +00:00
allexzander 7b725f04e0
Merge pull request #3358 from nextcloud/backport/3246/stable-3.2
[stable-3.2] VFS. Allow dehydartion of readonly files. Preserve 'readonly' flag when creating a placeholder.
2021-05-25 13:33:28 +03:00
allexzander 0b776d2be2 Fix review comments.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-05-25 07:58:00 +00:00