mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 13:25:52 +03:00
Code Issues Projects Releases Packages Wiki Activity
7083 commits 471 branches 254 tags 467 MiB
Commit graph

320 commits

Author SHA1 Message Date
Markus Goetz
7f1f62e14a CSync: Clean some more 2015-01-23 17:26:30 +01:00
Olivier Goffart
fe51ada1e8 Don't require NEON with Qt 5.4 2015-01-23 17:11:34 +01:00
Markus Goetz
6708c959d9 CSync: Remove c_list 2015-01-23 17:09:13 +01:00
Markus Goetz
af9daaeff7 CSync: Remove memory checks 
We will get OOMed before this fails.
 2015-01-23 16:59:51 +01:00
Markus Goetz
c9f9d55658 Merge branch 'qnam_csync_update' 
Conflicts:
	src/libsync/networkjobs.cpp
 2015-01-22 14:34:36 +01:00
Olivier Goffart
08043bed21 csync_update: Leave a margin of 1sec when comparing the time for the timezone changes 
Because FAT has a bad resolution, when the timezone is changed, there may be
one second of difference.

Issue #2438
 2015-01-20 18:34:24 +01:00
Markus Goetz
906779c4b1 SyncEngine: Use QNAM for csync_update 
This is for #2507
 2015-01-20 18:27:25 +01:00
Olivier Goffart
264471af43 csync: cleanup some unused error code 2015-01-15 12:19:06 +01:00
Olivier Goffart
e31514f769 csync propfind: Rename the directDownload property 
The owncloud server has a different name because if it was named the same
it would break the 1.7 client

Issue #2614
 2015-01-15 11:52:55 +01:00
Olivier Goffart
08d3ae9f02 csync_statedb: Have more granular error reporting when the loaddb fails 
In order to distiguish error from sqlite_open or from the integrity check

Issue #2673
 2015-01-15 11:36:24 +01:00
Christian Kamm
9b7e6cc5c1 Fix warnings. 
* remove Unused variable
* zorder for spacers makes no sense
 2015-01-14 11:28:53 +01:00
Olivier Goffart
a2803e4f5f csync_update: do not force writing on the db for directory with a changed date 
Fixes #2584
 2014-12-16 13:02:32 +01:00
Christian Kamm
53d5de685c Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/gui/folder.cpp
	src/gui/folder.h
	src/libsync/networkjobs.cpp
	src/libsync/owncloudpropagator.h
	src/libsync/propagatedownload.cpp
 2014-12-10 13:01:36 +01:00
Klaas Freitag
133a8ec225 Added a fixme for an edge case detected by QuickCheck. 2014-12-09 17:02:51 +01:00
Daniel Molkentin
3016844dd7 Merge branch 'master' into rename_client 
Conflicts:
	README.md
	src/gui/folderman.cpp
	src/gui/settingsdialog.cpp
	src/libsync/accessmanager.cpp
	src/libsync/propagateupload.h
 2014-12-02 13:37:22 +01:00
Olivier Goffart
512492bf30 Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/libsync/propagatedownload.cpp
 2014-12-01 14:37:47 +01:00
Olivier Goffart
2477c3914e csync_update: Ignore a difference of time of exactly one hour 
Issue #2438
 2014-12-01 13:53:30 +01:00
Klaas Freitag
3e34d000f2 Propagator: Add the chunk size to PUT requests. 2014-11-25 10:21:33 +01:00
Daniel Molkentin
058d868edd Merge remote-tracking branch 'origin/1.7' 2014-11-12 00:09:00 +01:00
Daniel Molkentin
281c0e1553 Merge branch 'master' into rename_client 
Conflicts:
	CMakeLists.txt
	src/gui/main.cpp
	src/libsync/accessmanager.cpp
	src/libsync/accessmanager.h
	src/libsync/owncloudpropagator_p.h
 2014-11-12 00:07:59 +01:00
Olivier Goffart
b04cb23ed5 t8.pl: fix the test for me 
On localhost, the other file (the bigger one) was downloaded first
 2014-11-11 16:38:20 +01:00
Olivier Goffart
7b4be209aa MOVE: fix moving with special character. 
The Destination header need to be %-encoded
 2014-11-11 16:27:06 +01:00
Daniel Molkentin
b54c079766 Adjust issue urls 2014-11-09 23:38:07 +01:00
Olivier Goffart
de11f602d5 Merge remote-tracking branch 'origin/il' 
Conflicts:
	csync/src/csync_private.h
	src/CMakeLists.txt
	src/gui/folder.cpp
	src/libsync/owncloudpropagator.cpp
	src/libsync/owncloudpropagator.h
	src/libsync/propagator_qnam.cpp
	src/libsync/propagator_qnam.h
	src/libsync/syncengine.cpp
	src/libsync/syncengine.h
	src/mirall/syncjournaldb.cpp
 2014-11-08 10:48:36 +01:00
Daniel Molkentin
f25d175b5d Merge remote-tracking branch 'origin/1.7' 2014-11-06 19:54:20 +01:00
Christian Kamm
eed91ddf46 Legacy propagator: Don't use mtime retrieved via _fstat64. 
May be the cause of #2431
 2014-11-06 12:16:55 +01:00
Christian Kamm
45eeb5065f Download: Avoid overwriting file with case conflict. #1914 2014-10-30 09:06:53 +01:00
Klaas Freitag
1029f9521c tests: exit t5.pl if running against ownCloud 6 
t5.pl checks the environment variable SERVER_VERSION and if that equals
"owncloud6" it bails out after a check of the sharing ocs api.
 2014-10-29 14:24:36 +01:00
Klaas Freitag
825eca078d tests: make t1.pl work on jenkins, for that disable a size compare. 2014-10-29 14:01:58 +01:00
Christian Kamm
4e20a02fe5 SyncJournalDB: Add filesize column to metadata. 
* Alter table to include column.
* Make get/set in SyncJournalDB store and load it.
* Make csync recover the stat_t's size member from it.
 2014-10-29 09:53:36 +01:00
Klaas Freitag
0692fea9d8 discovery: handle 503 reply code from server for directories 
503 for directories means that the dir is a mounted directory from an
external mount which currently is not available. The directory is
ignored and not traversed into during discovery phase.
 2014-10-27 19:21:12 +01:00
Daniel Molkentin
d76192cce1 Ignore reserved words on Windows 
Fixes #2385 and #2386
 2014-10-24 13:18:57 -04:00
Klaas Freitag
114c38c1ff csync tests: add some debug code to get behind the jenkins fails. 2014-10-23 17:33:47 +02:00
Olivier Goffart
dab01e3f3f csync_update: add the perms in the log 2014-10-22 17:25:38 +02:00
Klaas Freitag
9f6d7eb587 tests: use the ocs_url in the same semantics as the 1.6 branch. 2014-10-22 16:06:39 +02:00
Markus Goetz
47ad4e3fe8 CSync: Close/Reopen DB between update and reconcile 
update and reconcile happen in different threads. This code is safer.
(Even though depending on sqlite3 version it should work anyway)
 2014-10-22 15:42:13 +02:00
Olivier Goffart
3be5600caf t6.pl: fix missing space in curl command 2014-10-22 15:16:22 +02:00
Olivier Goffart
dd45b448d9 t6.pl: pass the --insecure flag to curl so it works on the test machine 2014-10-22 13:57:22 +02:00
Christian Kamm
d77fcea365 Csync tests: Don't use sqlite3_close_v2. 2014-10-22 12:44:33 +02:00
Christian Kamm
ba86988101 Csync tests: Fix broken tests. 
It is no longer ok to call csync_statedb_load() on a non-existant
database since it opens readonly only.
 2014-10-22 12:22:13 +02:00
Christian Kamm
de48e65091 Csync tests: Fix compile. 2014-10-22 11:45:48 +02:00
Markus Goetz
61e72ef50b CSync: statedb sanity check changes 2014-10-21 18:09:23 +02:00
Markus Goetz
24d4840c93 SyncJournalDB: Set WAL files to hidden 2014-10-21 15:58:56 +02:00
Olivier Goffart
5a109d9293 Fix t3.pl 
The fix in commit 86d8079 made the detection of changes inside
a directory more robust.
As a result, changes are detected inside a directory, even if the
files that are changed were moved away on the other remote, the algorithm
won't let the directory be removed and the directory will be re-created
 2014-10-21 12:10:12 +02:00
Olivier Goffart
56316bc980 csync_reconcile: remove useless debug output 2014-10-21 11:47:18 +02:00
Klaas Freitag
21c8e65d13 csync tests: Fix test after db changes. 2014-10-21 11:26:04 +02:00
Olivier Goffart
86d8079739 Reconcile: Make sure not to loose new files added in a directory removed on the server 
Found while investigating #2296

The problem is that we should not remove a directory locally if it contains
modified files.
But the modification time of the directory is not necessarily chaning (so
the instruction of the directory may still be NONE)

We have to move the child_modified test a bit down to be recursive
 2014-10-21 10:38:21 +02:00
Markus Goetz
5d048c18bc Sqlite3: Switch to WAL 
This is faster.
 2014-10-20 23:09:28 +02:00
Markus Goetz
0fb779d363 SyncEngine: De-initialize recursive PROPFIND value correctly 2014-10-20 22:24:28 +02:00
Markus Goetz
d33b68ccc9 CSync: Error out if DB error 2014-10-20 19:32:06 +02:00