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 and Daniel Molkentin
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 and Klaas Freitag
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 and Klaas Freitag
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
Daniel Molkentin
85d3c7a263
Merge remote-tracking branch 'origin/2.2'
2016-05-26 10:19:50 +02:00
Jenkins for ownCloud
1855950fa1
[tx-robot] updated from transifex
2016-05-26 02:33:30 -04:00
Olivier Goffart
159535fe90
Merge branch '2.2'
2016-05-25 16:30:17 +02:00
Olivier Goffart
fff5c280b3
SyncEngine: cleanup setting isDirectory
2016-05-25 16:27:40 +02:00
Olivier Goffart
e960b265a8
Merge remote-tracking branch '2.1' into 2.2
2016-05-25 16:23:58 +02:00
Olivier Goffart
f6b35e5d58
SyncEngine: invalid the blacklist entry when the rename destination change
...
The problem in this case is if we rename the file "xxx" to "invalid\file".
The rename will fail because the new filename constains a slash, and it
will be blacklisted.
But then if the user re-rename the file to "valid_name", then we should
invalidate the blacklist entry and retry to upload. But we did not do
that because renaming don't change the mtime and we did not store the
rename target in the database
IL issue 558
2016-05-25 15:32:45 +02:00
Markus Goetz
088a294fac
Update issue_template.md
...
Use 2.2 link
2016-05-25 11:33:10 +02:00
Jenkins for ownCloud
1d93af5f64
[tx-robot] updated from transifex
2016-05-25 02:19:18 -04:00
Markus Goetz
75efa8b252
sqlite: Update bundled version to 3.13.0
...
For OS X and Windows.
2016-05-24 17:27:31 +02:00
Markus Goetz
009a0b03da
Add ChangeLog for 2.2.1
2016-05-24 17:04:04 +02:00
Jenkins for ownCloud
8379a36a75
[tx-robot] updated from transifex
2016-05-24 07:40:14 -04:00
Daniel Molkentin
2f1a40ff7c
Travis coverity: Enforce Ubuntu 14.04 env, fix repo
2016-05-24 11:30:03 +02:00
Daniel Molkentin
c041ca6163
Fix pot. mem leak found by coverity (CID 96004)
2016-05-24 11:21:33 +02:00
Daniel Molkentin
eacc0c8bd6
Fix pot. mem leak found by coverity (CID 12900)
2016-05-24 11:21:33 +02:00
Jenkins for ownCloud
171de99e00
[tx-robot] updated from transifex
2016-05-24 02:19:53 -04:00
Jenkins for ownCloud