mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 21:46:03 +03:00
Code Issues Projects Releases Packages Wiki Activity
7329 commits 473 branches 255 tags 510 MiB
Commit graph

337 commits

Author SHA1 Message Date
Klaas Freitag
3af936c8a1 Some minor cleanups. 2015-02-24 22:02:29 +01:00
Klaas Freitag
d297580d26 Tests: Fix compile if NEON is absent. 2015-02-13 10:04:28 +01:00
Olivier Goffart
2a88f5083c t6.pl: Add a test that re-upload a chunked file with lot of chunks 2015-02-06 10:23:20 +01:00
Olivier Goffart
5ec793e045 propagateupload: Save the mtime given by the server in the reply to GET 
There could be a race condition if the file was updated on the server
between the discovery and the propagate phase. By taking the mtime from
the server, we make sure that we do not have a race.

This is tested by t6.pl with BIG3.file because the script was modifying
the file between the two phases
 2015-02-06 10:23:20 +01:00
Daniel Molkentin
59bdda6226 Require OpenSSL > 1.0.0, remove obsolete dep from csync 2015-02-05 13:08:28 +01:00
Jocelyn Turcotte
1ac523ec01 Output libocsync and libowncloudsync in the bin directory 
Windows finds DLLs using PATH or the directory of the process'
executable. By outputing those dependend DLLs together with
owncloud.exe, the developer only need to have OpenSSL's bin
and the qtkeychain build directory in his PATH to let the
dynamic linker find them.

As the documentation of RUNTIME_OUTPUT_DIRECTORY points out,
this only affects windows as other platforms don't consider
libraries as runtime targets.
 2015-02-04 15:00:22 +01:00
Jocelyn Turcotte
43a51c1bef Fix the MinGW build 
- qtkeychain isn't necessarily in a qt5keychain subdirectory.
- Explicitly add OpenSSL to the include directories
- Make sure that the USE_OUR_OWN_SQLITE3 code is initialized
  for csync by calling find_package.
 2015-02-04 14:50:38 +01:00
Olivier Goffart
52d330d8e5 csync: add neon include directories 2015-02-03 16:00:55 +01:00
Christian Kamm
43d6dbb0f2 SQL: Add debugging options. #2693 
OWNCLOUD_SQLITE_JOURNAL_MODE: To use something else than WAL
OWNCLOUD_SQLITE_TEMP_STORE: To test with storing temporaries in memory.
 2015-01-29 11:02:01 +01:00
Olivier Goffart
22d3a4a48f csync_owncloud: don't deref null pointer 2015-01-28 14:16:33 +01:00
Olivier Goffart
d70e146c1f Merge remote-tracking branch 'origin/ssl_client_cert' 
Conflicts:
	CMakeLists.txt
	csync/src/CMakeLists.txt
	csync/src/csync_owncloud.c
 2015-01-28 14:13:40 +01:00
Daniel Molkentin
989005d616 Clientcert support: Explictly link libsync against openssl 2015-01-28 13:31:17 +01:00
Joachim Schiele
9abc3e1333 fixes required by upstream 2015-01-23 19:22:56 +00:00
Olivier Goffart
502e7081cf Make it compile with neon 2015-01-23 17:59:07 +01:00
Olivier Goffart
dcba129a98 Make it compile without neon 2015-01-23 17:56:46 +01:00
Olivier Goffart
b856266e91 Remove neon link flag when not required 2015-01-23 17:35:17 +01:00
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
Nourredine
ba8b1bbe06 adds 'SSL client certificate' support from n.octeau with qknight changes as: 
* removed broken QSsl::SslV3 default
* rewrote slotHandleErrors(): no longer claim errors which are none.
* hack reverted: lib64 was not the cause for NixOS issues related to libraries.
* refactored csync/src/csync_owncloud.c and discovered+fixed why the dav_connect was never getting the certPath+certPassoword
* cleanup of code but seems this crushed the ssl client certificate support
* fixes the https://github.com/owncloud/client/issues/69#issuecomment-69358377 issue
* lots of cleanup
* From TODO list : translate all french comments into english
* changed _pemCertificate type from QString to QByteArray
 2015-01-21 23:55:11 +00: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