chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-15 09:30:05 +02:00
Code Activity
16,931 Commits 4 Branches 173 Tags
stable-3.3-lnk
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik SchmidtandKevin Ottens 69915ab594 Fix testVersionOfInstalledBinary for brandings 2020-12-30 16:17:47 +01:00
Dominik SchmidtandKevin Ottens 67f9890320 Use owncloudcmd in testVersionOfInstalledBinary 
... as it works without X in CI.
 2020-12-30 16:17:47 +01:00
Dominik SchmidtandKevin Ottens 635d2b2da2 Fix style 2020-12-30 16:17:47 +01:00
Dominik SchmidtandKevin Ottens 7e4d24de2b SocketApi: Avoid unneccessary conversions 2020-12-15 10:58:57 +01:00
Dominik SchmidtandKevin Ottens 06ac1c33e8 SocketApi: cleanup debug output 2020-12-15 10:58:57 +01:00
Dominik SchmidtandKevin Ottens 25cd52dd9f Add ASYNC_ASSERT_ICON_IS_EQUAL command to SocketApi 2020-12-15 10:58:57 +01:00
Dominik SchmidtandKevin Ottens d1f9b1a4f8 Make findWidget more powerful 2020-12-15 10:58:56 +01:00
Dominik SchmidtandKevin Ottens 67656fb136 Add Q_PROPERTYs for gui testing 2020-12-15 10:58:56 +01:00
Dominik SchmidtandKevin Ottens 596154a01a Switch GUI Testing SocketApi to Utf8 2020-12-15 10:58:56 +01:00
Dominik SchmidtandKevin Ottens ad033e40fd Fix build with recent Clang (on Linux) 2020-12-15 10:58:56 +01:00
Dominik SchmidtandKevin Ottens 3288a36da6 Add GUI testing SocketApi extension 2020-12-15 10:58:56 +01:00
Dominik SchmidtandKevin Ottens 539cef345e Switch to standard opt-out BUILD_TESTING instead of opt-in UNIT_TESTING 
Compare https://cmake.org/cmake/help/v3.0/module/CTest.html
Craft automatically handles BUILD_TESTING, so we don't need to handle it
in our own blueprint.
 2020-12-15 10:58:36 +01:00
Dominik SchmidtandKevin Ottens 17465a6f94 Fix lookup of system wide settings 2020-12-15 10:58:32 +01:00
Dominik SchmidtandKevin Ottens 687eb9665d Fix installation of vfs suffix plugin 2020-12-15 10:58:27 +01:00
Dominik SchmidtandKevin Ottens bd22caa5ec Remove unused include directories 2020-12-15 10:58:24 +01:00
Dominik SchmidtandKevin Ottens bfe136da7a Fix export of vfs functions 2020-12-15 10:58:23 +01:00
Dominik SchmidtandKevin Ottens 1104883fba Cleanup CMake (output) 2020-12-15 10:58:23 +01:00
Dominik SchmidtandKevin Ottens 5d9370594d Disable autostartCheckBox if autostart is configured system wide 2020-12-15 10:58:14 +01:00
Dominik SchmidtandKevin Ottens a985ea8624 Do not select ownCloud in Finder after installation to fix #6781 2020-12-15 10:58:11 +01:00
Dominik SchmidtandKevin Ottens 07f331717f Rename ocsync library to ${APPLICATION_EXECUTABLE}_csync 2020-12-15 10:57:56 +01:00
Dominik SchmidtandKevin Ottens aad928a6be Install libocsync to lib/ without subfolder. 
Installing to lib/${APPLICATION_EXECUTABLE} has caused a bunch of
irritations in the past and subtle annoying to fix bugs. To avoid name
clashes with branded clients ${APPLICATION_EXECUTABLE} becomes now
part of the filename instead of the subfolder.

The concrete motivation to change this now is that on Windows there
is no RPATH and it's not possible to run owncloud directly from the
Craft Root folder, which is nice when you're developing on Windows.

It would have been possible to change this just for Windows but as
written earlier this has caused lots of issues and thus I think it's
a good idea to just stay consistent accross platforms when touching it.
 2020-12-15 10:57:56 +01:00
Dominik SchmidtandKevin Ottens a50c665051 Simplify Sparkle handling in CMake 2020-11-25 09:43:59 +01:00
Dominik SchmidtandCamila (Rebase PR Action) ae38b88d1c Remove unused installers before copying new ones into the appdata dir 2020-11-24 18:22:33 +00:00
Dominik SchmidtandCamila (Rebase PR Action) d069fda9ab Extract filename of updateFile without leading slash 2020-11-24 18:22:33 +00:00
Dominik SchmidtandCamila (Rebase PR Action) dfac8c0e59 Escape msi and owncloud.exe path (who knows...) 2020-11-24 18:22:33 +00:00
Dominik SchmidtandCamila (Rebase PR Action) ed0dc68db2 Run msi properly and restart client after update 2020-11-24 18:22:33 +00:00
Dominik SchmidtandCamila (Rebase PR Action) 08b5981fb6 Implement basic .msi support in updater 2020-11-24 18:22:33 +00:00
Dominik SchmidtandKevin Ottens (Rebase PR Action) 8e48d53b04 Docs: Adopt upstream commit fe04300 for MSI installation 
See: https://github.com/owncloud/client/commit/fe043006c8f4a43b033243a85c294d21c7450238

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-10-05 07:18:35 +00:00
Dominik SchmidtandMichael Schuster 13d4b91935 Avoid warning because /MT overrides /MD flag 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-08-20 18:50:05 +02:00
Dominik SchmidtandMichael Schuster e4b53b12e1 Make OCUtil helper lib static and link it statically against crt 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-08-20 18:50:05 +02:00
Dominik SchmidtandKevin Ottens fd493a0598 Make qFatal() trigger the crash reporter on Windows 2020-07-01 14:54:32 +02:00
Dominik SchmidtandJulius Härtl cddb9aa8ba Support higher resolution theme icons 2018-10-23 23:07:17 +02:00
Dominik Schmidt 217c6bbcaf Add AppVeyor badge 2018-01-18 09:46:06 +01:00
Dominik Schmidt 486ccaff56 Enable tests in appveyor builds 2018-01-17 16:25:03 +01:00
Dominik Schmidt e0cc93c047 Enable appveyor builds 2018-01-17 16:21:09 +01:00
Dominik Schmidt fe3c68b9dd Fix Linux icons 2018-01-17 12:18:31 +01:00
Dominik Schmidt 7839c4d4e1 Revert "Disable stack protection for mingw win32 builds in 2.4" 
This reverts commit 298f1ab570.

We're shipping libssp-0.dll now with mingw builds. We would
have enough time to test this for 2.5.0 now anyway, but we
also will most likely switch to MSVC for that release.
 2018-01-14 14:39:29 +01:00
Dominik Schmidt 969d90d15b Fix UIC detection in windows cross env 2018-01-14 00:57:40 +01:00
Dominik Schmidt d8a279c671 Fix windows cross build of the updater and bump libcrashreporter-qt revision 2018-01-14 00:45:02 +01:00
Dominik Schmidt 6d56f30d9b Fix incorrect target_include_directories usage for crash reporter 2018-01-13 23:49:58 +01:00
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
Dominik Schmidt 01f3b82ea5 Move pulling docker images to their own stages 2018-01-12 17:19:22 +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
Dominik SchmidtandMarkus Goetz 7f51803d04 Only use $(MAKE) in doc target if make is used as generator 
The old behavior broke builds with other CMake generators like Ninja as it obviously has no concept of $(MAKE)
 2017-10-17 12:50:34 +02:00
Dominik SchmidtandRoeland Jago Douma bdd3dc743b Set CMAKE_INSTALL_RPATH as RPATH for installed executables 2017-10-05 22:01:37 +02:00
Dominik Schmidtandckamm a2ce739192 Set CMAKE_INSTALL_RPATH as RPATH for installed executables 2017-09-27 09:13:44 +02:00
Dominik SchmidtandMarkus Goetz 0fc3df45ce Remove obsolete FindQtKeychain for Qt4 2017-05-29 21:44:25 +02:00
Dominik SchmidtandMarkus Goetz 78dede2ac4 Fix build on Debian 7 (CMake pre 2.8.12) 2017-05-29 21:44:25 +02:00
Dominik SchmidtandMarkus Goetz 51041d0f15 Disable Qt4 CI 2017-04-20 09:39:41 +02:00
Dominik SchmidtandDaniel Molkentin d0af48c417 Add KDE tmp files to .gitignore 2013-10-03 17:05:00 +02:00
Dominik Schmidt 097be61c9f Fix QT_STRICT_ITERATOR errors 2012-11-28 23:31:03 +01:00
Dominik SchmidtandKlaas Freitag 2b2eb853fc Add qtkeychain to cmake - WIP read password from keychain. 
Conflicts:

	CMakeLists.txt
 2012-11-27 19:28:03 +01:00
Dominik Schmidt 351f9aedfb Add testing skeleton 2012-10-26 20:24:12 +02:00
Dominik SchmidtandKlaas Freitag 21d3ec4d2d Add patched FindOpenSSL to fix cross-compilation for windows 2012-08-23 17:24:23 +03:00
Dominik Schmidt 5d6c9339f8 Disable not building in bundle mode on OSX. Unless someone tests that codepath, it's probably better not to allow anyone to build it especially not by default 2012-08-06 16:01:43 +02:00
Dominik Schmidt 8fef939a1a Extend wizard raising hack to OS X. 2012-07-31 01:57:02 +02:00
Dominik Schmidt 336f8fbbd3 Fix error message. Thanks to Danimo for the heads up. 2012-07-31 01:43:41 +02:00
Dominik SchmidtandKlaas Freitag 9626f65b6b Add patched FindOpenSSL to fix cross-compilation for windows 2012-07-23 10:58:13 +02:00
Dominik SchmidtandKlaas Freitag 293b0cecaf Add patched FindOpenSSL to fix cross-compilation for windows 2012-07-23 10:57:18 +02:00
Dominik Schmidt d7fb6fa749 Fix installation on all platforms + bundle on osx 2012-07-17 15:16:02 +02:00
Dominik SchmidtandKlaas Freitag 77d71eb080 Load plugins on MacOSX. 2012-07-09 13:26:20 +02:00
Dominik SchmidtandKlaas Freitag d5de27f289 Apple: Fix loading plugins inside bundles. 2012-07-09 13:25:33 +02:00
Dominik SchmidtandKlaas Freitag 53d32a7485 ownCloud: set correct variable to fix warning condition. 2012-07-09 13:25:11 +02:00
Dominik SchmidtandKlaas Freitag a216790c28 do plugins on apple 2012-07-09 13:25:11 +02:00
Dominik SchmidtandKlaas Freitag 8d5af96f46 Compile cstdlib with -fPIC 2012-07-09 13:25:11 +02:00
Dominik SchmidtandKlaas Freitag 23d56249ca Fix owncloud linkage against neon 2012-07-09 13:25:11 +02:00
Dominik SchmidtandKlaas Freitag fcb3aa6208 Define O_NOATIME to 0 if it's not there 2012-07-09 13:24:15 +02:00
Dominik SchmidtandKlaas Freitag e9e7b0c685 Simplify FindNeon.cmake 2012-07-09 13:24:14 +02:00
Dominik SchmidtandKlaas Freitag 3d59926d8d fix building without log4c 2012-07-09 13:24:14 +02:00
Dominik SchmidtandKlaas Freitag 2b15df7af3 Set search hint for Libiniparser. 2012-07-09 13:23:49 +02:00
Dominik SchmidtandKlaas Freitag b9edff2179 ownCloud: Fix warning condition in reader code. 2012-06-26 18:24:55 +02:00
Dominik SchmidtandKlaas Freitag 02b617b536 Load plugins on MacOSX. 2012-06-26 18:24:39 +02:00
Dominik SchmidtandKlaas Freitag 4c6a1356a1 Compile cstdlib with -fPIC. 2012-06-26 18:24:39 +02:00
Dominik SchmidtandKlaas Freitag 19f460a9ea CMake: Fix owncloud linkage against neon. 2012-06-26 18:24:39 +02:00
Dominik SchmidtandKlaas Freitag 56e6b900db Define O_NOATIME to 0 if it's not there 2012-06-26 18:24:39 +02:00
Dominik SchmidtandKlaas Freitag 68b6fbeefe fix building without log4c 2012-06-26 18:24:39 +02:00
Dominik SchmidtandKlaas Freitag 68526da12f cmake: Added Iniparser path hints. 2012-06-26 18:24:39 +02:00
Dominik SchmidtandKlaas Freitag 4f8c6729ff Simplify FindNeon.cmake 2012-06-26 17:17:10 +02:00
Dominik Schmidt b7b617ac28 Add krazy target 2012-05-21 18:12:25 +02:00
Dominik SchmidtandKlaas Freitag c4667c893b Fix loading plugins inside MacOSX bundles. 2012-05-04 12:05:22 +02:00
Dominik SchmidtandKlaas Freitag 0160be06f5 ownCloud: Fix warning condition in reader code. 2012-05-04 12:04:58 +02:00
Dominik SchmidtandKlaas Freitag 4c98f6bcd8 Load plugins on apple. 2012-05-04 12:04:36 +02:00
Dominik SchmidtandKlaas Freitag a8c10780f2 Compile cstdlib with -fPIC. 2012-05-04 12:04:30 +02:00
Dominik SchmidtandKlaas Freitag ac6e5ff4b9 CMake: Fix owncloud linkage against neon. 2012-05-04 12:04:13 +02:00
Dominik SchmidtandKlaas Freitag 5ac2f676d7 Define O_NOATIME to 0 if it's not there. 2012-05-04 12:03:53 +02:00
Dominik SchmidtandKlaas Freitag 628151e997 CMake Modules: Simplify FindNeon.cmake. 2012-05-04 12:03:36 +02:00