chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-10-31 02:42:49 +01:00
Code
16,179 Commits 4 Branches 173 Tags 91 MiB
v3.2.0-rc3
Commit Graph

16179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jürgen Weigert
a4b46db91e Merge pull request #4949 from owncloud/jnweiger-tray-patch-patch-patch 
Update accountsettings.cpp fixing the tray-patch
 2016-06-07 15:59:53 +02:00
Jürgen Weigert
ebc44fa494 Update accountsettings.cpp 2016-06-07 14:21:50 +02:00
ckamm
355a8a0a27 Workaround for Ubuntu 16.04 tray issue #4944 (#4947) 2016-06-07 11:48:25 +02:00
Christian Kamm
66f041f74c Fix Qt4 build 2016-06-07 10:05:57 +02:00
Christian Kamm
6d02d76cfd Fix compile warnings in tests 2016-06-07 09:43:04 +02:00
Christian Kamm
48efbcb8ca Merge remote-tracking branch 'origin/2.2' 2016-06-07 09:39:44 +02:00
Jenkins for ownCloud
ab050f9093 [tx-robot] updated from transifex 2016-06-07 02:19:44 -04:00
Jenkins for ownCloud
bf9cffe4b3 [tx-robot] updated from transifex 2016-06-06 02:19:25 -04:00
Carla Schroder
43f727cf69 fix win install instructions: build path and docker image name (#4901) 2016-06-05 10:56:56 +02:00
Jenkins for ownCloud
256331fbaa [tx-robot] updated from transifex 2016-06-05 02:18:37 -04:00
Jenkins for ownCloud
32e6585ae6 [tx-robot] updated from transifex 2016-06-04 02:19:18 -04:00
Olivier Goffart
d072e4a678 Fix compilation on windows 2016-06-03 13:28:53 +02:00
Olivier Goffart
b99c8fe28b Folder: fix removing folder with escaped characters (#4943) 
FolderDefinition::save and load escapes the alias. We also need to escape
it when we remove it.
New folder can't be created with alias that needs escaping, but old folder
from old config may still exist, and we must allow user to delete them.
 2016-06-03 13:10:01 +02:00
Olivier Goffart
5a3120bd52 Folder: Ignore change from the watcher if the file has not changed its mtime or size (#4942) 
For issue #4927:
On Windows 10, we get a notification after the sync is finished for file that were
just downloaded. The guard we have against our "own changes" are only working when
the sync is running and the OwncloudPropagator still alive.
 2016-06-03 13:06:11 +02:00
Jenkins for ownCloud
9ea69be6ab [tx-robot] updated from transifex 2016-06-03 02:19:51 -04:00
Jenkins for ownCloud
86680a53e0 [tx-robot] updated from transifex 2016-06-03 01:15:59 -04:00
Daniel Molkentin
801cb42d57 Merge pull request #4939 from owncloud/osx_filewatcher_fix 
OS X filewatcher fix
 2016-06-02 18:37:38 +02:00
Markus Goetz
51f8a59a9a OS X: White-list the folder watcher enums 
I got syncs triggered for even opening a file by double clicking it in Finder
and having launched Preview.app (e.g. for JPEG files).
 2016-06-02 18:20:07 +02:00
Daniel Molkentin
ebbe5acf2b Merge pull request #4938 from owncloud/fix_4840 
GUI: don't force the environment variable for high DPI on linux.
 2016-06-02 18:13:25 +02:00
Olivier Goffart
6ccd9e872d GUI: don't force the environment variable for high DPI on linux. 
Setting the Environment variable only for owncloud makes in inconsistant with
other Qt application running at the same time.

The users can still set it themself for the whole desktop if they wish.

Addresses #4840
 2016-06-02 17:57:10 +02:00
Daniel Molkentin
da69756bb0 Merge pull request #4935 from owncloud/fix_updater_memleak 
Fix memleak in updater
 2016-06-02 15:36:49 +02:00
Daniel Molkentin
1787da8a9d Fix memleak in updater 2016-06-02 15:03:52 +02:00
Giovanni Capuano
f0f82d02ff Fix link to the binary packages in README.md 2016-06-02 14:55:48 +02:00
Jenkins for ownCloud
ff20cd4d57 [tx-robot] updated from transifex 2016-06-02 02:19:35 -04:00
Jenkins for ownCloud
9ab812f89b [tx-robot] updated from transifex 2016-06-01 02:19:17 -04:00
Jenkins for ownCloud
e031f7d090 [tx-robot] updated from transifex 2016-06-01 01:18:50 -04:00
Markus Goetz
de82d8fcdb QNAM: Try to workaround missing Qt patches #4720 #3888 #4051 
We try this on all platforms now so we have more consistent behaviour.
 2016-05-31 10:26:52 +02:00
Stephen Colebrook
af2b712dc6 Search results are filtered by server. Don't filter a second time. 
Also allows searching on attributes other than displayname in ldap
configurations. Search results match web and mobile apps.
 2016-05-31 09:46:52 +02:00
Stephen Colebrook
d4b72132d6 Search results are filtered by server. Don't filter a second time. Also allows searching on attributes other than displayname in ldap configurations. Search results match web and mobile apps. (#4902) 2016-05-31 09:45:38 +02:00
Markus Goetz
a507558dee Connectivity: Reduce ETag job timeout to 60 sec #4275 
Before it used the default job timeout
 2016-05-31 09:35:47 +02:00
Jenkins for ownCloud
e73c3199c0 [tx-robot] updated from transifex 2016-05-31 02:20:28 -04:00
Markus Goetz
d88ab4653b Connectivity: Delete job on timeout #4275 
This was not done if there was no reply
 2016-05-30 18:15:41 +02:00
Klaas Freitag
9a2450c4c1 Update changelog for 2.2.1 2016-05-30 17:19:40 +02:00
Daniel Molkentin
3c1f5e662f Remove stray file 2016-05-30 12:05:22 +02:00
Daniel Molkentin
100ee69ddd Merge pull request #4923 from RobinGeuze/2.2 
Fix Qt4 build
 2016-05-30 11:50:50 +02:00
Robin Geuze
d45d6ca9da Fix Qt4 build 2016-05-30 09:55:45 +02:00
Daniel Molkentin
2608c7007e Merge pull request #4922 from owncloud/fix_4840 
Don't try to determine pixel ratio with Qt < 5.6.0
 2016-05-30 09:20:50 +02:00
Jenkins for ownCloud
06a88ea9a4 [tx-robot] updated from transifex 2016-05-30 02:41:51 -04:00
Daniel Molkentin
0194ebb222 Don't try to determine pixel ratio with Qt < 5.6.0 
This seems to be broken. Worst case users can still
set it manually

Addresses #4840
 2016-05-30 08:27:57 +02:00
Jenkins for ownCloud
dc654ac846 [tx-robot] updated from transifex 2016-05-29 02:18:52 -04:00
Jenkins for ownCloud
370fd5062c [tx-robot] updated from transifex 2016-05-28 02:19:09 -04:00
Daniel Molkentin
763016bd8f Merge pull request #4916 from mwleeds/patch-1 
Fix typo in folder.cpp
 2016-05-27 18:13:05 +02:00
Daniel Molkentin
00d20b4a42 Merge pull request #4913 from owncloud/normalize_name_in_filestatus 
Undo regression caused by 727e73d
 2016-05-27 18:08:08 +02:00
Matthew Leeds
7f0cc5b699 Fix typo in folder.cpp 2016-05-27 11:13:18 -04:00
Daniel Molkentin
a2b238e2e5 Undo regression caused by 727e73d 
normalization to NFC is still required. Mac OS API will not take
care of that by default.

Resolves #4884
 2016-05-27 16:03:59 +02:00
ckamm
0e2c16e827 Certs: Re-ask for different cert after rejection #4898 (#4911) 
Previously rejecting any kind of certificate meant that the user
was never asked again, even if the certificate changed.

Now we keep track of which certificates were rejected and ask again
if the ones mentioned in the ssl errors change.

mitmproxy is excellent for testing this.
 2016-05-27 12:08:42 +02:00
ckamm
b9fdae6d67 Progress: Don't count items without propagation jobs #4856 (#4910) 
* Progress: Don't count dirs without propagation jobs #4856

These directory SyncFileItems are necessary for bookkeeping
but should not influence the progress display at all.

* Progress: Skip ignored files #4856
 2016-05-27 10:52:00 +02:00
Jenkins for ownCloud
c34115610e [tx-robot] updated from transifex 2016-05-27 02:19:21 -04:00
Jenkins for ownCloud
d3a93cbaeb [tx-robot] updated from transifex 2016-05-27 01:15:50 -04:00
Olivier Goffart
275ad1e157 Utility: Better fix for the translation of minutes, seconds, ... 
The plural was not translated because of QTBUG-3945. Work around it.
Issue #4855
 2016-05-26 12:17:16 +02:00