mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-21 05:13:04 +03:00
Code Issues Projects Releases Packages Wiki Activity
16516 commits 486 branches 258 tags 463 MiB
Commit graph

16516 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nextcloud bot
57aeeca172
[tx-robot] updated from transifex 2021-04-02 03:55:01 +00:00
Nextcloud bot
962bbf3043
[tx-robot] updated from transifex 2021-04-01 03:55:02 +00:00
Felix Weilbach
6e147a7a8c
Merge pull request #3052 from nextcloud/bugfix/remove-html-tags-from-notifications 
Remove html tags from strings that may appear in notifications
 2021-03-31 17:36:15 +02:00
Felix Weilbach
b2377ff64f Remove html tags from strings that may appear in notifications 
The content of notifications on MacOS are not allowed to contain HTML
tags in it. Linux (Free Desktop) notifications may contain HTML tags
in their content. However, it is optional that the notification daemon
interprets the tags. The GNOME notification daemon does not interpret
HTML tags and even does not strip them off. KDE's daemon interprets
the tags. For now I think it's the best solution to remove the HTML
tags. In the future we should fire a action if the user clicks on the
notification and react on it and open the link then. This should work
on all platforms. But as this change involves working with the native
MacOS api and I don't have hardware for that at the moment for that I
will postpone it.

Fixes #2200

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-31 16:23:42 +02:00
Camila
be6e0f26df
Merge pull request #3049 from nextcloud/bump-version-rc3 
Bump version to 3.1.83.
 2021-03-31 12:27:22 +02:00
Camila
8741f4386c
Bump version to 3.1.83. 
Signed-off-by: Camila <hello@camila.codes>
 2021-03-31 12:14:18 +02:00
Nextcloud bot
ac6b62e19d
[tx-robot] updated from transifex 2021-03-31 03:55:58 +00:00
Nextcloud bot
044b5a33e9
[tx-robot] updated from transifex 2021-03-30 03:51:17 +00:00
Felix Weilbach
dde9eb645e
Merge pull request #3040 from nextcloud/bugfix/macos-dont-deploy-bearer 
Don't deploy bearer plugin on MacOS
 2021-03-29 16:01:41 +02:00
Felix Weilbach
354f4c02ee Don't deploy bearer plugin on MacOS 
Fixes #2944, #2237

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-29 13:46:07 +00:00
Camila
58dd076b2b
Merge pull request #3015 from nextcloud/bugfix/update-wizard-doc 
Update documentation for the account wizard.
 2021-03-29 14:51:59 +02:00
Felix Weilbach
7faa80c1e1 Update documentation for the account wizard 
This update is necessary because of the following commit:
b5cf820b42

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-29 12:10:37 +00:00
Nextcloud bot
f7dd4bbf69
[tx-robot] updated from transifex 2021-03-29 03:52:25 +00:00
Nextcloud bot
a7ac7991b8
[tx-robot] updated from transifex 2021-03-28 03:51:07 +00:00
Nextcloud bot
8eb5ed07bf
[tx-robot] updated from transifex 2021-03-27 03:52:53 +00:00
allexzander
4ce2e79e90
Merge pull request #3043 from nextcloud/bugfix/vfs-syncroot-register-error 
Fix VFS CfAPI Syncroot Register Error.
 2021-03-27 02:44:13 +02:00
allexzander
28771b25e3 Fix VFS CfAPI Syncroot Register Error. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-03-27 02:41:24 +02:00