chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-04 17:31:01 +02:00
Code Activity
11,836 Commits 4 Branches 173 Tags
v2.5.0-alpha
Commit Graph
11836 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Klaas Freitag 3b96097cf6 Config: Look for exclude file in a relative path. 
If the application binary is not installed in /usr/bin the client
with this patch considers to check the relative location
../../etc/owncloud-client/ to find the system exclude.

This is an important bit for AppImage based packages of the client,
as this runs from a temporar mountpoint and the system file can not
be found under /etc.
 2017-12-15 09:54:40 +01:00
Christian Kamm 298f1ab570 Disable stack protection for mingw win32 builds in 2.4 
Mingw builds could have it enabled! But we need to ship libssp and test
this more. For the upcoming 2.4 release it should be disabled.
 2017-12-15 09:16:59 +01:00
Jenkins for ownCloud 79dd8e9074 [tx-robot] updated from transifex 2017-12-15 02:18:52 +01:00
Markus Goetz 8d5afff0a4 Update ChangeLog for 2.4.0 2017-12-14 20:07:14 +01:00
Olivier Goffart 4dc49ff3b0 SyncEngine: Recover when the PUT reply (or chunkin's MOVE) is lost 
This can happen if the upload of a file is finished, but we just got
disconnected right before recieving the reply containing the etag.
So nothing was save din the DB, and we are not sure if the server
recieved the file properly or not. Further local update of the file
will cause a conflict.

In order to fix this, store the checksum of the uploading file in
the uploadinfo table of the local db (even if there is no chunking
involved).  And when we have a conflict, check that it is not because
of this situation by checking the entry in the uploadinfo table.

Issue #5106
 2017-12-14 11:56:12 +01:00
Olivier Goffart 4369853ddb TestSystem: Add QIODevice in the serverOverride function, and add a DelayedReply 
Preparing to add test that needs the QIODevice.
Also make the DelayedReply so we can generalize the existing delay on FakeChunkMoveReply
to any reply.
 2017-12-14 11:56:12 +01:00
Christian Kamm d870729709 Require Qt >= 5.6 #6241 2017-12-14 11:31:30 +01:00
Christian Kamm f40cceaf04 Share link: Adjust design of folder sharing permissions #6192 2017-12-14 08:34:44 +01:00
Jenkins for ownCloud b357003a95 [tx-robot] updated from transifex 2017-12-14 02:18:37 +01:00
rockihack 5cc3b526e8 stack-protector is not supported on hppa. 
(cherry picked from commit 8a963a67f2)
 2017-12-13 11:28:22 +01:00
rockihack 1b2a8ba6b0 Enable stack-protector-strong on Windows and macOS. 
(cherry picked from commit 586fd346ea)
 2017-12-13 11:28:22 +01:00
rockihack 8a963a67f2 stack-protector is not supported on hppa. 2017-12-13 11:27:48 +01:00
rockihack 586fd346ea Enable stack-protector-strong on Windows and macOS. 2017-12-13 11:27:48 +01:00
Christian Kamm e5ed8fc90a Merge remote-tracking branch 'origin/2.4' 2017-12-13 11:03:24 +01:00
Markus Goetz 75676f8830 Notifications: Propagate "Dismiss" as DELETE to server #5922 
(cherry picked from commit e86416fff7)
 2017-12-13 11:00:40 +01:00
Jenkins for ownCloud 530853c988 [tx-robot] updated from transifex 2017-12-13 02:18:36 +01:00
Olivier Goffart 02283fc686 Merge pull request #6224 from owncloud/deprecated 
Remove use of deprecated Qt API
 2017-12-12 11:48:04 +01:00
Christian Kamm dcf0baa9de Journal: 64bit inodes, fix storing uint64s generally 
In addition to using the right function when retrieving inodes this
*also* fixes a more general bug ownsql had with storing uint64 values
that didn't fit into an int64.
 2017-12-12 10:30:54 +01:00
Martin cd2057fc04 Update Overlay Icon naming 2017-12-12 10:18:00 +01:00
Jenkins for ownCloud 3e294d5339 [tx-robot] updated from transifex 2017-12-12 02:18:35 +01:00
Olivier Goffart bae00358b9 Merge pull request #6219 from owncloud/config 
Move config and remove most dependencies form the sync engine.
 2017-12-11 17:10:18 +01:00
Jenkins for ownCloud 36573a5c6f [tx-robot] updated from transifex 2017-12-11 02:18:33 +01:00
Jenkins for ownCloud 9a835af7ce [tx-robot] updated from transifex 2017-12-10 02:18:34 +01:00
Jenkins for ownCloud ca48ff793c [tx-robot] updated from transifex 2017-12-09 02:18:34 +01:00
Olivier Goffart 58e8a25869 Enable deprecated warnings 2017-12-08 16:16:06 +01:00
Olivier Goffart d517d92f6c FolderWizard: don't use deprecated API 2017-12-08 16:16:06 +01:00
Olivier Goffart 71dcf7fc37 SSLButton: Removes some call to deprecated functions 2017-12-08 16:16:02 +01:00
Olivier Goffart 0a59faf03d OcsJob: Use QUrlQuery 
Qurl::setEncodedQueryItems is deprecated.
 2017-12-08 16:15:48 +01:00
Olivier Goffart 7bd48b1327 cmd: remove usage of deprecated qInstallMsgHandler 2017-12-08 16:15:48 +01:00
Olivier Goffart 8c652e061d Remove uses of deprecated QString::fromAscii 2017-12-08 16:15:48 +01:00
Olivier Goffart a4816d6a8c Updater: use QUrlQuery 
QUrl::addQueryItem is deprecated
 2017-12-08 16:15:47 +01:00
Olivier Goffart 1a503d54f6 Remove usage of deprecated qSort 2017-12-08 16:15:47 +01:00
Olivier Goffart 263668b1cb Remove use of deprecated translate call 2017-12-08 16:15:38 +01:00
Olivier Goffart 3df65460f5 Remove usage of QString::null 
Replaces by "QString()"
 2017-12-08 16:15:22 +01:00
Olivier Goffart 74672d493d Utility: use QUrlQuery 
For QUrl::setQuery is deprecated in Qt5
 2017-12-08 16:15:17 +01:00
Olivier Goffart f1b7d506ae csync_exclude: fix compilation of non-test builds 2017-12-08 09:43:26 +01:00
Jenkins for ownCloud fc8c88be41 [tx-robot] updated from transifex 2017-12-08 02:18:35 +01:00
Olivier Goffart 4581d708ff Account: remove dependency with ConfigFile 
Part of #6213
 2017-12-07 17:39:16 +01:00
Olivier Goffart e0a14cac5b ConfigFile: use QStandardPaths::AppConfigLocation for the config file 
Also use appName instead of appNameGui in order to compute the path

Issue: #2245

The reason is to respect the XDG spec on Unix (#1601) and might help
on windows roaming profiles (#684)
 2017-12-07 17:39:16 +01:00
Olivier Goffart ac844a2a45 AbstractNetworkJob: move the httpTimeout from the propagator to the network job 
Remove one dependency from the config file for the sync engine.
Part of issue #6213
 2017-12-07 17:39:16 +01:00
Olivier Goffart 7230fa6b4f SyncOptions: move to its own file 
It does not really belong in the discoveryphase.h as it is used also for
propagator option.

Also use C++11 style member initializer
 2017-12-07 17:35:38 +01:00
Olivier Goffart e25af4f0dc csync_exclude: Fix compile 
csync_exclude.cpp:428:17: error: assigning to 'char *' from incompatible type 'const char *'
        bname = path;
                ^~~~

The C library's strrchr always return 'char*'
Only the C++'s std::strrchr has two overloads
 2017-12-07 17:34:14 +01:00
Christian Kamm 287670c9d6 Excludes: Remove fnmatch codepath 
Now all exclude patterns can be translated to regular expressions.
 2017-12-07 14:38:21 +01:00
Christian Kamm 994f3bb644 Excludes: fnmatch doesn't treat '{' as special 
Neither the documentation at
http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13
nor the fnmatch source code in <glibc>/posix/fnmatch_loop.c points
toward { causing special matching behavior.
 2017-12-07 14:38:21 +01:00
Christian Kamm e5c780ee19 Excludes: Translate full-path patterns to regex 
Improves full matches by more than an order of magnitude
and also improves speed of traversal matches by roughly 20%,
judging by the check_csync_exclude performance test.
 2017-12-07 14:38:21 +01:00
Christian Kamm 1c3d5ab158 Excludes: Introduce dir-only regex matches 2017-12-07 14:38:21 +01:00
Christian Kamm 5d668eca40 Excludes: Optimize Desktop.ini check 2017-12-07 14:38:21 +01:00
Christian Kamm 7ab127ad53 Excludes: Refactor for pending improvements 
Make ExcludedFiles something that is instantiated outside of
the CSYNC context and then given to it as a hook.

ExcludedFiles still lives in csync_exclude and the internal
workings haven't been touched.
 2017-12-07 14:38:21 +01:00
Olivier Goffart dd91f4a86e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/csync/csync.cpp
 2017-12-07 09:37:50 +01:00
Olivier Goffart 3485109125 Jenkinsfile: Fix compilation 
Add a CMAKE_PREFIX_PATH so it finds the right QtKeychain
 2017-12-07 09:35:04 +01:00