Commit Graph
14674 Commits
Author SHA1 Message Date
Olivier Goffart 48c55b7d29 csync/std: don't build in a separate library
There is no need to create a static library for the csync/std file, just
put everything together in csync
2018-01-13 13:58:17 +01:00
Olivier Goffart 776bbbf7b1 Don't include sqlite3.h from headers
So that sqlite is not part of the public interface of csync
(and that the sqlite include path don't need to be passed when compiling
libsync or gui)
2018-01-13 13:58:17 +01:00
Dominik Schmidt f326bf371d Merge pull request #6299 from dschmidt/linux-docker-ci
Use docker for Linux CI
2018-01-13 13:46:04 +01:00
Jenkins for ownCloud 4cf7ca4162 [tx-robot] updated from transifex 2018-01-13 02:18:33 +01:00
István Váradi 9eb395efd1 The Debian Docker image reference is fixed 2018-01-12 19:55:56 +01:00
Roeland Jago Douma 99aebf292c Yet another drone image
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-12 19:36:09 +01:00
Dominik Schmidt 01f3b82ea5 Move pulling docker images to their own stages 2018-01-12 17:19:22 +01:00
Roeland Jago Douma d1c84fd859 Bump drone docer used for appimage
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-12 15:21:30 +01:00
Jenkins for ownCloud c22e3aaa4b [tx-robot] updated from transifex 2018-01-12 02:19:52 +01:00
Dominik Schmidt dbf15fb8dc Make setLaunchOnStartup debug output more meaningful 2018-01-11 16:11:23 +01:00
Dominik Schmidt a253129fd6 Fix running tests until #6210 is fixed 2018-01-11 16:11:06 +01:00
Dominik Schmidt a8ba3ee9e1 Use docker for Linux CI 2018-01-11 16:10:31 +01:00
István Váradi 66c745e133 Moved Debian build to Drone 2018-01-11 11:34:41 +01:00
Olivier Goffart 9613f6437d Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libsync/networkjobs.cpp
2018-01-11 10:46:50 +01:00
Jürgen Weigert 9dc765142c Update updater.cpp
depricate suffix nightly, promote suffix daily
2018-01-10 16:19:08 +01:00
Christian Kamm 7d70f1becb Ignore files that can't be encoded for the filesystem
There's an upstream bug where QTextCodec::canEncode returns true even
though it should be false. This works around that issue and adds a test.

The original work was done in 72809ef5b1

See #6287, #5676, #5719
See https://bugreports.qt.io/browse/QTBUG-6925
2018-01-10 13:36:00 +01:00
Jenkins for ownCloud a476c5420a [tx-robot] updated from transifex 2018-01-10 02:18:51 +01:00
Christian Kamm cdd8d10940 Fix resizing crash when currentPage() is null
Sentry:
https://sentry.io/owncloud/desktop-win-and-mac/issues/425331770/
2018-01-09 13:54:11 +01:00
Christian Kamm 883deb1c5d Fix potential crash in Composite job destruction
Sentry:
https://sentry.io/owncloud/desktop-win-and-mac/issues/427476987/
2018-01-09 13:53:57 +01:00
Christian Kamm e389fcaecb Avatars: Use old location for servers <10 #6279 2018-01-09 11:34:56 +01:00
Christian Kamm 585d2b20bd Exclude regex: Restore old matching on Windows #6245
Unfortunately matching behaved differently on Windows. This patch
restores the previous matching behavior but still uses the new regular
expression based matching.

Further work will hopefully unify the behavior between platforms without
breaking backwards compatibility.
2018-01-09 11:09:05 +01:00
Jenkins for ownCloud 9078d9cfab [tx-robot] updated from transifex 2018-01-09 02:18:35 +01:00
Daniel Nicoletti a7ee1a95a6 Download and decrypt file if parent folder is marked as encrypted 2018-01-08 21:08:31 +01:00
Daniel Nicoletti 3abbbab6a0 Faster way to detecting CSE capability 2018-01-08 21:08:31 +01:00
Christian Kamm 51b662fdfe Minor logging additions
- Clearly mark local and remote discovery start, to make this searchable
even without --logdebug.
- Promote two messages from debug to info: The 'N entries read from db'
message is useful and the 'read from db but ignored' message is rare
and surprising - if there's a bug there we want to see what happened in
the logs.
2018-01-08 09:36:30 +01:00
Jenkins for ownCloud b6d74ad753 [tx-robot] updated from transifex 2018-01-08 02:18:35 +01:00
Jenkins for ownCloud 5656323434 [tx-robot] updated from transifex 2018-01-06 02:18:39 +01:00
Christian Kamm 81baebf113 owncloudcmd: Set proxy earlier #6281
In particular before the capability call.

Also warn if no proxy is set because the command line doesn't follow the
strict format requirements.

(cherry picked from commit d0e7f61db6)
2018-01-05 10:26:55 +01:00
Christian Kamm f7c884d4d1 owncloudcmd: Remove some dead code
(cherry picked from commit 0f8790d993)
2018-01-05 10:26:53 +01:00
Christian Kamm d0e7f61db6 owncloudcmd: Set proxy earlier #6281
In particular before the capability call.

Also warn if no proxy is set because the command line doesn't follow the
strict format requirements.
2018-01-05 10:23:29 +01:00
Christian Kamm 0f8790d993 owncloudcmd: Remove some dead code 2018-01-05 10:12:25 +01:00
Christian Kamm 86377aa37a Folder: Remove unused 'dirty proxy' setting 2018-01-05 09:44:20 +01:00
Christian Kamm 3988f3ad77 GCC: Fix implicit-fallthrough warnings 2018-01-05 09:43:53 +01:00
Christian Kamm 7aa9af08c3 Issues: Speed up insertion and add hard upper limit #6272
Since sorting was enabled permanenty the list would be resorted with
each inserted issue. When inserting thousands of ignored files that
would make the whole ui freeze up.

Instead, sorting is disabled for inserts now and is reenabled after some
time has passed. That way users usually see the sorted view without the
lockups. Also, there's now a maximum of 50k issue entries.
2018-01-05 08:44:27 +01:00
Jenkins for ownCloud 15803d1837 [tx-robot] updated from transifex 2018-01-05 02:18:35 +01:00
Christian Kamm ab9d6285c6 Proxy: Hostname validation and reconnection on setting change
Where 'validation' currently just means "check whether it's empty".

Code adapted from wiggiBe's original PR #6140
2018-01-04 14:30:24 +01:00
Jenkins for ownCloud c0c10fd5f1 [tx-robot] updated from transifex 2018-01-04 02:18:34 +01:00
Jenkins for ownCloud e2d4a38639 [tx-robot] updated from transifex 2018-01-03 02:18:34 +01:00
Jenkins for ownCloud f89676d4bb [tx-robot] updated from transifex 2018-01-02 02:18:36 +01:00
Jenkins for ownCloud b9c167fc13 [tx-robot] updated from transifex 2018-01-01 02:18:34 +01:00
Jenkins for ownCloud 3bac06d6e5 [tx-robot] updated from transifex 2017-12-31 02:18:36 +01:00
Jenkins for ownCloud 504e11b5bb [tx-robot] updated from transifex 2017-12-30 02:18:36 +01:00
Daniel Nicoletti e2c895e61f Fix encrypted file location on the server 2017-12-29 17:28:35 +01:00
Daniel Nicoletti ca92c46970 Add category logging to PropagateUploadEncrypted 2017-12-29 17:28:35 +01:00
Daniel Nicoletti 50916bcda5 Mark ClientSideEncryption::isFolderEncrypted() as const 2017-12-29 17:28:35 +01:00
Daniel Nicoletti c6491d50bb Replace deprecated Qt API usage 2017-12-29 17:28:35 +01:00
Daniel Nicoletti fdc96d3a4f Fix deprecated use of QUrl::setQueryItems() 2017-12-29 17:28:35 +01:00
Daniel Nicoletti e06e04ee93 Fix parsing list of encrypted folders 2017-12-29 17:28:35 +01:00
Tomaz Canabrava 7d68fa17e7 Merge pull request #107 from dantti/clientSideEncryptionV3
Prepend "nextcloud" for all logging categories
2017-12-29 11:52:40 +01:00
Jenkins for ownCloud b80ba97154 [tx-robot] updated from transifex 2017-12-29 02:18:34 +01:00