Dominik Schmidt
86ea5876cd
Use standard png2ico in our cross env too
2018-01-13 23:28:52 +01:00
Dominik Schmidt
bb8468c627
Add Linux CI Dockerfile
2018-01-13 23:28:18 +01:00
Dominik Schmidt
fc62e9e9d9
Fix .def and .rc files not being compiled into windows shell extensions
2018-01-13 21:01:09 +01:00
Dominik Schmidt
15967b1219
Install all dlls to BINDIR so craft does not ignore them
2018-01-13 13:58:17 +01:00
Dominik Schmidt
0656c77da8
Set CMAKE_CXX_STANDARD to 14
2018-01-13 13:58:17 +01:00
Dominik Schmidt
81c20352e1
Use new ECMAddAppIcon macro for application icons.
...
cmake/modules/ECMAddAppIcon.cmake is heavily patched to support sidebar icons, OUTFILE_BASE parameter and to not include 64 and 64@2x icons on macOS which are not supported. All changes are made in a way that we can upstream this.
2018-01-13 13:58:17 +01:00
Dominik Schmidt
4e52ee9ebd
Build Explorer extension if building with MSVC
2018-01-13 13:58:17 +01:00
Dominik Schmidt
6ee87a77cc
Fix macOS updater build without deprecated Qt apis
2018-01-13 13:58:17 +01:00
Dominik Schmidt
539d6fd92e
Link client against QtMacExtras as it bundles qtmacgoodies
2018-01-13 13:58:17 +01:00
Dominik Schmidt
da98e2aa28
Fix building sqlite on macOS and Windows
2018-01-13 13:58:17 +01:00
Dominik Schmidt
1f9763eda9
Package libssp-0.dll in NSIS installer.
...
It's needed since 586fd346ea
activated stack-protector-strong
2018-01-13 13:58:17 +01:00
Dominik Schmidt
cbf470f17b
Fix csync installation on windows
2018-01-13 13:58:17 +01:00
Dominik Schmidt
1f12d6344b
Fix sqlite compilation (on OSX)
2018-01-13 13:58:17 +01:00
Olivier Goffart
437d45981e
Remove unused c_strlist
2018-01-13 13:58:17 +01:00
Olivier Goffart
3ae327ea8e
Modernize out CMakeLists.txt
...
Mainly uses target_include_directories instead of include_directories
so libraries public include directory get automatically added when adding
the target in target_link_library
2018-01-13 13:58:17 +01:00
Olivier Goffart
1c721e9422
shell_integration/dolphin: Silence some warnings
2018-01-13 13:58:17 +01:00
Olivier Goffart
5d0aa5f039
Remove unused c_path
2018-01-13 13:58:17 +01:00
Olivier Goffart
41798cef18
Csync: remove some unused build system stuff
2018-01-13 13:58:17 +01:00
Olivier Goffart
1c11778693
Remove the unusued csync_file_locked_or_open test in csync_reconcile
...
It is unused. Also remove the corresponding error code
2018-01-13 13:58:17 +01:00
Olivier Goffart
3ddd4b6f16
Get rid of csync_log
...
We use Qt's debugging code everywhere
2018-01-13 13:58:17 +01:00
Olivier Goffart
d948ed11a1
Csync: use QElapsedTimer and qCInfo instead of CSYNC_LOG and its own csync time function
...
This allow to remove all the csync time manipulation routne which are now unused
2018-01-13 13:58:17 +01:00
Olivier Goffart
257d8142b1
Build system: Get rid of QtVersionAbstraction.cmake
...
Use modern cmake with target_link_libraries and Qt5:: that
automatically add the include path and compile flags
2018-01-13 13:58:17 +01:00
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
Dominik Schmidt
01f3b82ea5
Move pulling docker images to their own stages
2018-01-12 17:19:22 +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
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