mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 21:15:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
16233 commits 473 branches 255 tags 510 MiB
Commit graph

16233 commits

This branch
This branch
All branches
Author SHA1 Message Date
Felix Weilbach
f882dee8dc
Merge pull request #3059 from nextcloud/inotify 
Improve Inotify cmake code
 2021-04-13 08:46:54 +02:00
Nicolas Fella
3bc66bea66 Improve Inotify cmake code 
Use the FindInotify from ECM. It handles the case of Linux vs BSD
correctly automatically.

Also only find Inotify on Linux and BSD

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-04-13 06:36:14 +00:00
Nextcloud bot
f119e4cf64
[tx-robot] updated from transifex 2021-04-13 03:56:05 +00:00
Matthieu Gallien
8102d51b99
Merge pull request #3065 from nicolasfella/dolphincmake 
[dolphin] Clean up CMake code
 2021-04-12 16:22:18 +02:00
Nicolas Fella
e207cfdbfc [dolphin] Clean up CMake code 
Remove some stuff that is not needed.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-04-12 13:27:46 +00:00
Matthieu Gallien
a1f78c4330
Merge pull request #3003 from nextcloud/fix-and-comment-default-build-type 
Remove non-functional default CMAKE_BUILD_TYPE
 2021-04-12 14:16:44 +02:00
Elsie Hupp
1183b3f7b9 Remove non-functional default CMAKE_BUILD_TYPE 
Signed-off-by: Elsie Hupp <9206310+elsiehupp@users.noreply.github.com>
 2021-04-12 11:26:08 +00:00
Felix Weilbach
efdd46fb6d
Merge pull request #3058 from nicolasfella/cloudproviders 
Use FindPkgConfig to find libcloudproviders and related libs
 2021-04-12 13:15:38 +02:00
Nicolas Fella
b34a901838 Use FindPkgConfig to find libcloudproviders and related libs 
Instead of using custom find modules.

This allows using imported targets which make the code much nicer.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-04-12 10:00:08 +00:00
Nextcloud bot
e74746c4e7
[tx-robot] updated from transifex 2021-04-12 03:55:08 +00:00
Nextcloud bot
96c51faa9c
[tx-robot] updated from transifex 2021-04-11 03:53:37 +00:00
Nextcloud bot
c956a462e2
[tx-robot] updated from transifex 2021-04-10 04:06:36 +00:00
Felix Weilbach
4efe00feca
Merge pull request #3075 from nextcloud/bugfix/embed-version-info-win 
Embed version and icon into windows executable
 2021-04-09 14:29:46 +02:00
Felix Weilbach
c49dc440bb Embed version and icon into windows executable 
These changes are necessary because of changing the compilation
process for the gui from a single executable to static lib +
executable in commit 0521dce174.
Otherwise the version and icon information will be lost.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-09 13:53:12 +02:00
Nextcloud bot
5e15f4f2c6
[tx-robot] updated from transifex 2021-04-09 03:55:46 +00:00
allexzander
b6371bf39b
Merge pull request #3073 from nextcloud/bump_version_to_3.2.5 
Bump version to 3.2.50
 2021-04-08 11:26:20 +03:00
allexzander
740e1d2f0d Bump version to 3.2.50. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-08 11:09:49 +03:00
allexzander
5e6c31b262
Merge pull request #3072 from nextcloud/bump-version-3.2.0 
Bump version to 3.2.0.
 2021-04-08 10:47:24 +03:00
allexzander
8550bfa8f1 Bump version to 3.2.0. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-08 10:38:10 +03:00
allexzander
f6afb62a53
Merge pull request #3069 from nextcloud/feature/user-status 
User status bug fixing...
 2021-04-08 10:18:13 +03:00
Camila
1ca0ea49dd Remove unnecessary local variable. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
29f4a3857b Reposition qml elements for the folder status icon. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
050bd49373 Rename enumToUserString => enumToString. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
8986975a17 Use enum class instead of enum. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
50de12b3c3 Undo unnecessary removal of lines. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
163015492a Fix #3067: missing apps icon. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
c8ac99c8cf Align status text with server url. 
Cleans the space in the beginning of the string when there is no emoji
set.

Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
e51dad79a2 Refactor UserStatus. 
- Make preDefinedStatus a local var.
- Add function to get the status user string.

Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
d2b762aa66 Move curly brackets to the correct line. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
98cfc362f7 Remove const and reference of base types. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:58 +00:00
Nextcloud bot
835a61c5ee
[tx-robot] updated from transifex 2021-04-08 03:55:06 +00:00
allexzander
5eb6834167
Merge pull request #3057 from nextcloud/bugfix/vfs-windows-lnk-files-freeze-issue 
Fix VFX Windows .lnk files freeze/crash issue
 2021-04-07 12:28:05 +03:00
allexzander
4b58c2b7b7 Fix review comments. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-07 09:08:02 +00:00
allexzander
82953d0601 Fix review comments. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-07 09:08:02 +00:00
allexzander
de85b79bb8 Address review comments. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-07 09:08:02 +00:00
allexzander
cb8b6ccd9b Ignore *.lnk files on Windows. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-07 09:08:02 +00:00
allexzander
13f4bb541d Treat .lnk files as normal files without hydrating them or creating a placeholder. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-07 09:08:02 +00:00
allexzander
3906ae0922 Another way to fix this. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-07 09:08:02 +00:00
allexzander
7235c708dc Added .lnk file placeholder creation fix. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-07 09:08:02 +00:00
allexzander
d5b6d93978 Fix VFS freeze when syncing '.lnk' files on Windows. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-07 09:08:02 +00:00
Matthieu Gallien
4a7145f1f3
Merge pull request #3068 from nextcloud/bug/fixAssertEditIgnoredFiles 
use QFileInfo to check if path is absolute to avoid assert on windows
 2021-04-07 10:06:29 +02:00
Matthieu Gallien
d6752c96b1 use QFileInfo to check if path is absolute to avoid assert on windows 
on windos absolute path does not have to start with / . Remove failing assert
when editing ignored files list.

Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
 2021-04-07 07:40:07 +00:00
Nextcloud bot
77681ff5b5
[tx-robot] updated from transifex 2021-04-07 03:55:50 +00:00
allexzander
4c8378030d
Merge pull request #3061 from nextcloud/bugfix/vfs-syncroot-reg-params-non-temp 
Create std::wstrings out of const wchar_t* so a copy is created every time
 2021-04-06 15:46:06 +03:00
allexzander
0a33e99053 Create std::wstrings out of const wchar_t* so a copy is created every time. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-06 10:03:22 +03:00
allexzander
454226b3ea
Merge pull request #3060 from nextcloud/bugfix/reduce-socketapi-logging 
Reduce Socket API logging.
 2021-04-06 09:49:21 +03:00
allexzander
e15045977e Reduce Socket API logging. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-06 09:34:20 +03:00
Nextcloud bot
a599cd2c3f
[tx-robot] updated from transifex 2021-04-06 03:54:22 +00:00
Nextcloud bot
487f29cf80
[tx-robot] updated from transifex 2021-04-04 03:53:11 +00:00
Nextcloud bot
2268facd9d
[tx-robot] updated from transifex 2021-04-03 04:11:49 +00:00