chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-20 13:27:08 +02:00
Code Activity
17,214 Commits 4 Branches 173 Tags
v3.4.0-do-not-use
Commit Graph
17214 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Kamm 6451eb3ade Tray: Add a 'New account...' action if no account is configured #5307 
Useful when left-clicking the tray icon isn't working for some reason.
 2016-11-18 12:17:05 +01:00
Jenkins for ownCloud 01528427b5 [tx-robot] updated from transifex 2016-11-18 02:18:35 +01:00
Jenkins for ownCloud cec4d7b9ff [tx-robot] updated from transifex 2016-11-17 02:18:43 +01:00
Olivier Goffart efa7821dd2 Revert "Discovery: consider also the "shared by me" as shared" 
This reverts pull request 5313 (commit
2d6e473a40 and
2f3db04e87)

The problem is that this loads the server too much.
 2016-11-16 17:45:40 +01:00
Markus Goetz 89f55cf9df Folder: Add comments after discussion about pre-selected selective sync 2016-11-16 14:08:05 +01:00
Markus GoetzandGitHub 52552a4204 Merge pull request #5102 from owncloud/chunking-ng 
Chunking ng
 2016-11-15 15:56:52 +01:00
Olivier GoffartandOlivier Goffart 2f3db04e87 Rename SyncFileStatus::sharedWithMe to shared 
Last commit for issue #4788 made the meaning to be simply shared
(with the user or from the user)
 2016-11-15 14:32:20 +01:00
Olivier GoffartandOlivier Goffart 2d6e473a40 Discovery: consider also the "shared by me" as shared 
The "S" in the permission is only for the "Shared with me" files.
It is only used to show the shared status in the overlay icons.
But we also wish to show the shared status for files that are shared
"by" the users. We can find that out using the 'share-types' webdav
property. If set, then we are sharing the object.
We fake a 'S' in the permission as for our purpose, they mean the same.

Issue #4788
 2016-11-15 14:32:20 +01:00
Olivier Goffart 92027e8692 SyncEngineTestUtils: Do don't allocate a buffer for the whole file 
As the file can be some hunreds of megabytes, allocating such big arrays may
cause problems.

Also make the timeout a bit bigger so the test can rununder valgrind.
 2016-11-15 11:39:40 +01:00
Olivier Goffart 2723cd225e FolderStatusDelegate: Fix compiler warning. 
QStyleOptionProgressBarV2 is deprecated in Qt5.
 2016-11-15 10:16:41 +01:00
Jenkins for ownCloud acd151102c [tx-robot] updated from transifex 2016-11-15 02:18:36 +01:00
Olivier GoffartandGitHub 77e790d2ee Merge pull request #5304 from owncloud/Kawohl-linktocentral 
documnetation.
 2016-11-14 12:43:10 +01:00
Olivier GoffartandGitHub 899c675f0a Merge pull request #5267 from payload/fix_4608 
nautilus integration: "share" extension for syncing folders
 2016-11-14 12:35:18 +01:00
Olivier GoffartandGitHub fb76487e76 Merge pull request #5266 from rmekarni/patch-1 
Fix find_library FindCMocka.cmake
 2016-11-14 12:20:24 +01:00
Tobias HaeusslerandOlivier Goffart 0c0a3ca0a5 Add manifest file on Windows to make the application UAC aware. 2016-11-14 12:16:58 +01:00
Olivier Goffart 5377d1e283 Chunking-NG: code cleanup after review 2016-11-14 10:42:07 +01:00
Jenkins for ownCloud 676ad530e7 [tx-robot] updated from transifex 2016-11-14 02:18:26 +01:00
Jenkins for ownCloud fbcb01ed27 [tx-robot] updated from transifex 2016-11-13 02:18:26 +01:00
Jenkins for ownCloud c2b006e857 [tx-robot] updated from transifex 2016-11-12 02:18:26 +01:00
Jenkins for ownCloud 0e7ccea588 [tx-robot] updated from transifex 2016-11-11 02:18:27 +01:00
Jenkins for ownCloud c16deb3e44 [tx-robot] updated from transifex 2016-11-10 02:18:27 +01:00
Jenkins for ownCloud 019544fcfd [tx-robot] updated from transifex 2016-11-10 01:15:14 +01:00
Jonathan Kawohl 5f0167b19e removed openssl_version variable, 2016-11-09 10:25:32 +01:00
Jonathan Kawohl 29d3c33eb2 added missing quotes 2016-11-09 08:59:14 +01:00
Jonathan Kawohl 469eca1f5f added link to central 2016-11-09 08:59:14 +01:00
Jonathan Kawohl 0864d67a9a fixing wrong files Revert "fix for https://github.com/owncloud/client/issues/1251" 
This reverts commit 4f1feab845.
 2016-11-09 08:59:14 +01:00
Jonathan Kawohl e9503664f5 fix for https://github.com/owncloud/client/issues/1251 2016-11-09 08:59:14 +01:00
Jonathan Kawohl 58cee61624 added info on qtkeychain 
added installation info on qtkeychain
 2016-11-09 08:59:14 +01:00
Jonathan Kawohl d23d07f99b Correcting for PR comments 2016-11-09 08:59:14 +01:00
Jonathan Kawohl d70db810dd updated link for documentation and added more info to osx build 2016-11-09 08:59:14 +01:00
Jenkins for ownCloud 842129f99d [tx-robot] updated from transifex 2016-11-09 02:18:28 +01:00
ckammandGitHub 36d61ef3a9 Doc: Add sync algorithm overview and comments (#5277) 
* Doc: Add sync algorithm overview and comments
 2016-11-08 16:10:55 +01:00
Christian Kamm f1f27221a7 Conflicts: Use the local mtime for the conflict file name #5273 
Otherwise local conflict files may be overridden in a restore
situation. See ticket for details.
 2016-11-08 14:47:51 +01:00
Christian Kamm eb012d26ee FolderStatusModel: Minor cleanups. 2016-11-08 14:01:07 +01:00
Christian Kamm 9ee8187083 Sort folder list alphabetically #5299 2016-11-08 14:01:07 +01:00
Christian Kamm b0c45cfc89 Test: Don't fail when DST change is near #5284 2016-11-08 11:13:19 +01:00
Christian Kamm 90cea69692 Network: Add "Accept" header for some firewalls #5298 2016-11-08 11:01:49 +01:00
Jenkins for ownCloud 155bdfbffe [tx-robot] updated from transifex 2016-11-08 02:18:26 +01:00
Christian Kamm 0e2782d369 Terminate sync when pausing from context menu #5290 2016-11-07 12:50:06 +01:00
Jenkins for ownCloud 6b3d0e69aa [tx-robot] updated from transifex 2016-11-07 02:18:26 +01:00
Jenkins for ownCloud f30aee6d4e [tx-robot] updated from transifex 2016-11-06 02:18:34 +01:00
Jenkins for ownCloud 82f86eb019 [tx-robot] updated from transifex 2016-11-05 02:18:29 +01:00
Olivier Goffart 9573c5e64d Merge remote-tracking branch '2.2' into master 
For the reanslation. Now transifex should be updated to update master.
This should normally be the last merge from 2.2

 Conflicts:
	mirall.desktop.in
	translations/client_sl.ts
	translations/client_th.ts
 2016-11-04 16:51:58 +01:00
Olivier Goffart 15f2b911d9 ChunkingNG: remove stale files when resuming 2016-11-04 16:43:01 +01:00
Jenkins for ownCloud f5aff70398 [tx-robot] updated from transifex 2016-11-04 16:41:40 +01:00
Olivier GoffartandOlivier Goffart e3a4c3989a SyncEngine: disable heuristics for backup restoration for server >= 9.1 
The ownCloud 9.1 server has a data-fingerprint property that the admin must
change in case of backup restoration. When this change, the client understands
that a backup was restored, and will generate conflict files and re-upload
new files.

The heuristics based system checks that there is at least two files wose mtime
is put back in the past and no files that goes forward. In that case we ask the
user before creating the conflicts.

This commit disable the heuristics for newer server that have the data-fingerpint.
And change the heuristics to two hours because we want to avoid false positive due
to some clock error, and that 2 hours of lost due to backup restoration is probably
not so bad.

We only ask the user in the heuristics based aproach so in practice this mean that
the "backup-detected" dialog will no longer appear with newer server.

Relates issues #5260, #5109
 2016-11-04 16:30:58 +01:00
Jenkins for ownCloud 3e954bc17f [tx-robot] updated from transifex 2016-11-04 02:18:27 +01:00
Jenkins for ownCloud 2527569bb8 [tx-robot] updated from transifex 2016-11-03 02:18:27 +01:00
Jenkins for ownCloud 1e197531cb [tx-robot] updated from transifex 2016-11-02 02:18:28 +01:00
Jenkins for ownCloud 8b876576eb [tx-robot] updated from transifex 2016-11-01 02:18:29 +01:00