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
ckamm
bf02ccc1e8
Remember to upload files that are locked during a sync run ( #4865 )
...
See owncloud/enterprise#1342
2016-05-23 09:03:03 +02:00
Jenkins for ownCloud
7ba961c21a
[tx-robot] updated from transifex
2016-05-23 02:19:05 -04:00
Jenkins for ownCloud
cb7be78352
[tx-robot] updated from transifex
2016-05-22 02:19:13 -04:00
Jenkins for ownCloud
813bc15a78
[tx-robot] updated from transifex
2016-05-22 01:15:47 -04:00
Jenkins for ownCloud
6cb194e0d5
[tx-robot] updated from transifex
2016-05-21 02:19:09 -04:00
Markus Goetz
552ba94c41
SyncEngine: Set isDirectory before syncItemDiscovered
...
(cherry picked from commit fc1933803e
2016-05-20 17:00:22 +02:00
Markus Goetz
fc1933803e
SyncEngine: Set isDirectory before syncItemDiscovered
2016-05-20 16:58:44 +02:00
Markus Goetz
46e4ec3183
Checksums: Use SHA1 like in >=2.2
2016-05-20 16:31:47 +02:00
Olivier Goffart
03e3b3bf50
Upload: put the job in the active list while doing the checksum computation.
...
This fixes an issue in which too many jobs are started un parallel
while uploading many files, which could cause too much memory usage as the
chunks are stored in memory.
Probably the fix for #4611
2016-05-20 16:28:27 +02:00
Christian Kamm
9aed8dbce8
Checksums: Compute content checksum on download #4375
...
Cherry-picked from d6d35029
2016-05-20 16:06:30 +02:00
ckamm
c6794cd338
Progress info: Reset between syncs #4856 (PR #4872 )
2016-05-20 15:07:54 +02:00
Jenkins for ownCloud
65ec1b74d5
[tx-robot] updated from transifex
2016-05-20 02:19:16 -04:00
ckamm
567fe87e98
Use natural sorting for filenames if available #4859 ( #4864 )
2016-05-19 15:36:46 +02:00
Christian Kamm
a1ba23eea9
Activity: When a new notification arrives, switch to that tab #4805
2016-05-19 14:13:07 +02:00
Jenkins for ownCloud
1a3c9a9c1a
[tx-robot] updated from transifex
2016-05-19 02:19:20 -04:00
Markus Goetz
a038c99232
Upload: Remove bandwidth quota debug message #4837
2016-05-18 16:18:13 +02:00
Olivier Goffart
30c8fa1c93
Utility: Fix translation of second, minute, hour
...
Issue #4855
A typo in the context string made the translation lookup fail.
But also the %Ln was not recognized as a plural form by transifex, so only
the singular was translated
2016-05-18 10:52:22 +02:00
Olivier Goffart
010649f997
FolderWizard: remove dead code and fix the alias
...
Remove a bunch of dead code.
And also set the root folder name properly since alias is gone.
Fix the warning:
QWizard::field: No such field 'alias'
2016-05-18 10:52:22 +02:00
Jenkins for ownCloud
597f2a4dfc
[tx-robot] updated from transifex
2016-05-18 02:19:16 -04:00
Olivier Goffart
cf1fe690a3
Shibboleth: Show the inspector if OWNCLOUD_SHIBBOLETH_DEBUG is set
...
Help to debug https://github.com/owncloud/enterprise/issues/1265
2016-05-17 12:29:20 +02:00
