mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 06:55:59 +03:00
Code Issues Projects Releases Packages Wiki Activity
9868 commits 471 branches 256 tags 514 MiB
Commit graph

9868 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Jenkins for ownCloud
1855950fa1 [tx-robot] updated from transifex 2016-05-26 02:33:30 -04: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
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
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
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
Jenkins for ownCloud
31b27bea38 [tx-robot] updated from transifex 2016-05-17 02:18:59 -04:00
Jenkins for ownCloud
04f99f3bd7 [tx-robot] updated from transifex 2016-05-15 02:19:07 -04:00
Jenkins for ownCloud
fbf92ac239 [tx-robot] updated from transifex 2016-05-14 02:19:15 -04:00
hefee
669a72f0e1 A final release version number breaks this regex (#4835) 
f.ex. a valid verson nr: 2.2.0
-> fist \d+ = 2
-> second \d+ = 2
-> the last \d+ = 0
-> .+ in not matching, because there is nothing to match
 2016-05-13 16:55:11 +02:00
Jenkins for ownCloud
2f0e65d37c [tx-robot] updated from transifex 2016-05-13 02:25:05 -04:00
Olivier Goffart
5676685f58 SyncEngine: Add a compile option so we rename to restoring a move we don't have the permission to do 
IL issue 550
 2016-05-12 13:15:30 +02:00
Christian Kamm
db9ccb40a4 Fix compile with strict C flags 2016-05-12 13:14:40 +02:00
Christian Kamm
d4c15d2c38 Ignores: expand escapes #4568 
(cherry picked from commit d7bd1300a8)
 2016-05-12 11:53:17 +02:00
Hefee
edb3759684 For tests we do not need a xserver running. 
Use for tests QTEST_GUILESS_MAIN and QTEST_APPLESS_MAIN.
 2016-05-12 11:34:21 +02:00
Christian Kamm
0f9c32452c Protocol: Increase width of timestamp column #4721 
Since the font metrics aren't reliable on windows, we add some
extra space there.
 2016-05-12 10:24:34 +02:00
Daniel Molkentin
45dd1d0acf Bump to 2.2.1 2016-05-12 09:58:12 +02:00
Daniel Molkentin
552af7b94d 2.2.0 final 2016-05-12 09:58:12 +02:00
Christian Kamm
8934979ba1 timeAgo test: Fix for qt4, clean up 2016-05-12 09:25:15 +02:00
Daniel Molkentin
b3e16e0eb0 Merge pull request #4825 from owncloud/22-user-manual 
[Doc] 2.2 user manual updates
 2016-05-12 08:20:55 +02:00
Carla Schroder
7773380deb update file manager screenshot 2016-05-11 12:44:27 -07:00
Carla Schroder
e22050a434 updates to 2.2 user manual 2016-05-11 12:37:40 -07:00
Daniel Molkentin
7b0231bfce Merge pull request #4821 from owncloud/notification_doc 
Documentation draft to introduce notifications.
 2016-05-11 21:16:35 +02:00
Jocelyn Turcotte
edc58c045f Fix assert on restore after propagation (#4823) 
The assert was there to make sure that this case wasn't happening
to eventually be properly tested. Remove the assert for now but this
codepath should eventually be unit tested using this specific situation.
 2016-05-11 18:16:46 +02:00