chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-24 07:42:46 +01:00
Code
16,931 Commits 4 Branches 173 Tags 91 MiB
stable-3.3-lnk
Commit Graph

466 Commits

Author SHA1 Message Date
Julius Härtl
1cedb1919f
Integrate libcloudproviders support 
This commit integrates support for libcloudproviders
desktop integration API. If build with the library it
will check on startup if the DBus interface is available
and then use it instead of the legacy status icon.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-12-14 11:19:25 +01:00
Olivier Goffart
58e8a25869 Enable deprecated warnings 2017-12-08 16:16:06 +01:00
Jürgen Weigert
17126de5c7 APPLICATION_NAME may contain whitespace 
Need some quotes to survive in makensis.
 2017-10-26 18:44:38 +02:00
Jocelyn Turcotte
d9f6468310 Windows: Remove navigation pane entries when uninstalling 
Issue #5295
 2017-10-24 16:10:53 +02:00
Jocelyn Turcotte
9e36cabcbf macos: Add a sidebar icon 
In the process, use an iconset to generate the icns using iconutil.
Also add some missing icon resolutions according to the guidelines.

Issue #296
 2017-07-31 18:43:47 +02:00
Olivier Goffart
20f1257e88 csync: Remove iconv depedency 
We use iconv to normalize the string on mac. But the iconv version
on mac does not support full unicode.
So we will use Qt to normalize the string
 2017-07-13 10:01:17 +02:00
Olivier Goffart
6e57b0219e Don't link dirrectly against openssl 
All our crypto code is handled by qt nodaways.
No need to carry this dependency.

Especially since it causes warnings on system where there are
twp openssl version installed:
/usr/bin/ld: warning: libcrypto.so.1.0.0, needed by /usr/lib/libQt5Network.so.5.9.0, may conflict with libcrypto.so.1.1
 2017-06-13 11:27:23 +02:00
Christian Kamm
aeeb408c74 Merge branch '2.3' 2017-06-08 13:02:34 +02:00
Dominik Schmidt
0fc3df45ce Remove obsolete FindQtKeychain for Qt4 2017-05-29 21:44:25 +02:00
Dominik Schmidt
78dede2ac4 Fix build on Debian 7 (CMake pre 2.8.12) 2017-05-29 21:44:25 +02:00
Jocelyn Turcotte
4ad190a558 Use Qt logging categories for logging 
This gives more insight about the logs and allow setting fine-tuned
logging rules. The categories are set to only output Info by default
so this allows us to provide more concise logging while keeping the
ability to extract more information for a specific category when
developping or debugging customer issues.

Issue #5647
 2017-05-11 17:22:59 +02:00
Jocelyn Turcotte
4d3212b31f Merge branch 2.3 into master 2017-05-09 18:23:01 +02:00
Jocelyn Turcotte
dca2b67338 Favor QtKeychain installed together with Qt 
By default we will look in /usr/lib, which would prevent us from
using a different path for Qt as QtKeychain depends on Qt itself.
 2017-05-08 23:18:06 +02:00
Olivier Goffart
9aeb587d6c Require Qt5 2017-04-20 09:39:41 +02:00
Markus Goetz
6487bb071b NSIS: Don't display link on finish page 2017-03-06 15:40:10 +01:00
Markus Goetz
5ef2e88f00 NSIS: Adjust to 5.6.2 image 2017-01-17 17:35:32 +01:00
Romain Mekarni
a9019ccbad Fix find_library FindCMocka.cmake 2016-10-22 14:52:27 +02:00
Jocelyn Turcotte
2b274e9460 Fix the MSVC build 
- Replace functions that are provided by MinGW with a Win32-based
  implementation
- Explicitly export needed symbols from ocsync.dll
- Rename share.h to sharemanager.h since the name clashes with one
  of the Windows headers and get included from there
- Remove the timestamp from the fallback csync stderr logging, it's
  not used since we always provide a log callback
 2016-09-16 17:43:39 +02:00
Olivier Goffart
1d09f6b60f Allow to disable Shiboleth to build without QtWebkit (#5166) 2016-09-11 16:14:08 +02:00
Daniel Molkentin
7de70516f1 Fix module loading 2016-08-05 12:35:52 +02:00
Daniel Molkentin
b575ded464 More GmbH -> Inc Copyright header fixes 2016-07-26 16:53:11 +02:00
Markus Goetz
928643f597 NSIS: Properly uninstall both x64 and x86 DLLs #4762 
Viel hilft viel ;-)
 2016-05-03 18:35:01 +02:00
Markus Goetz
d1649ce4df OS X: Allow ampersand in APPLICATION_NAME #4657 2016-04-15 11:30:49 +02:00
Christian Kamm
4f79f1b5e8 Explicitly depend on Qt5Test. 2016-04-12 12:45:55 +02:00
Markus Goetz
6c517638d0 NSIS Silent mode: Force uninstall before install #4543 2016-03-18 16:00:29 +01:00
Lukas Reschke
7db3bc91b5 Bump year to 2016 
My yearly contribution to the client 😉
 2016-02-10 19:52:55 +01:00
Hefee
aa8b772bff Don't install tests and cmocka lib. 
Neither tests nor the libcmocka needs to be installed globally.
 2016-02-05 14:14:07 +01:00
Daniel Molkentin
0ef9bd9e23 Remove bearer plugins 
Causes regressions due to constant Wifi scanning
 2016-01-04 11:54:11 +01:00
Olivier Goffart
685f2a259f csync: remove PLUGIN install patch from cmake files 
This conflicts with the KDE_INSTALL_PLUGINDIR and prevent the
dolphin plugin to be installed at the right location.

Since csync no longer have plugin, this can be removed
 2015-12-02 13:13:41 +01:00
Klaas Freitag
300c1c2055 Merge remote-tracking branch 'origin/depclean' into 2.1 
Conflicts:
	cmake/modules/QtVersionAbstraction.cmake
 2015-11-18 14:43:41 +01:00
Klaas Freitag
6123fab091 CMake version abstractions: Remove some dependencies. 
That lets us get rid of the hard dependency on Qt tools which are
not easily available everywhere.
 2015-11-11 15:24:02 +01:00
Markus Goetz
fd4a5100a6 NSIS: Include Qt bearer management DLLs #3969 2015-11-11 15:19:15 +01:00
Markus Goetz
dae724b21c QtVersionAbstraction: Quick not neeed on OS X 2015-11-05 11:35:42 +01:00
Markus Goetz
c8590c4468 Remove legacy propagator and neon 
The code was already uneeded/unbuilt on Windows and OS X.
 2015-10-20 17:57:43 +02:00
Klaas Freitag
cb3a301f2c Merge pull request #3899 from sebasje/sebas/cmake 
fix multiarch library path for Debian/Ubuntu
 2015-10-06 15:36:43 +02:00
Sebastian Kügler
a7cf1b04ad Simplify creating the library path 
Instead of checking whether the library path ends up somewhere in /usr,
set the architecture prefix, anyway. The library path mechanism is also
used in custom prefixes, without this change, the library gets installed
globally on Debian and Ubuntu, leading to non-standard behaviour and
cross-build problems, as multiple architecture builds of this library
can't be installed alongside each other.

This is the minimal change to correct this behaviour from upstream cmake.
 2015-09-29 00:15:39 +02:00
Daniel Molkentin
c71058980a Revert "NSIS: Try to ignore (invalid) errors from NSIS UAC" 
This reverts commit 38eaf241fa.
 2015-09-17 14:47:54 +02:00
Daniel Molkentin
38eaf241fa NSIS: Try to ignore (invalid) errors from NSIS UAC 2015-09-17 13:40:02 +02:00
Phil Davis
7d191763b5 Minor build etc typos 
Just some random stuff I noticed while looking at how this beast is put
together.
 2015-09-10 13:20:11 +05:45
Olivier Goffart
bfb637e64d Fix build with old cmake 
DIRECOTRY is new in 2.8.12.
Uses PATH instead
 2015-08-14 14:21:40 +02:00
Kirill Bychkov
7786f1f9a9 Fix linking with libinotify on OpenBSD. 2015-08-13 09:44:55 +03:00
Daniel Molkentin
c7353fc382 Revert "win32: libwebp has been bumped to version 5" 
This reverts commit 18efb21157.

Our toolchain relies on an older version now that has version 4
 2015-08-07 09:21:08 +02:00
Daniel Molkentin
5657d4ec1b NSIS: Remove (almost untranslated) Slovak tr for now 2015-08-06 17:36:53 +02:00
Daniel Molkentin
864bf33f10 NSIS: Elevate uninstaller, too 
Resolves #3546
 2015-08-04 12:38:29 +02:00
Daniel Molkentin
db8b919099 NSIS: add polish translation 2015-08-03 20:02:11 +02:00
Daniel Molkentin
18efb21157 win32: libwebp has been bumped to version 5 2015-08-03 19:24:01 +02:00
Daniel Molkentin
f15236acb7 remove stay file 2015-08-01 18:48:00 +02:00
Daniel Molkentin
f66ebb2f1e NSIS: Actually call the elevation wrapper 2015-07-31 18:25:17 +02:00
Daniel Molkentin
b9edc64982 NSIS: Fix NSIS error handling 2015-07-17 14:43:18 +02:00
Daniel Molkentin
d00aa3da84 NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true. 2015-07-17 14:42:58 +02:00
Daniel Molkentin
fa6dc8dbb7 Adjust to new version of NSIS UAC 2015-07-17 14:42:26 +02:00
Daniel Molkentin
7a8a8ceedc NSIS: depend on nsProcess instead of Processes NSIS plugin 
The Processes plugin is no longer maintained, and OBS
compiles an up-to-date version of nsProcess for us.
 2015-07-17 14:42:18 +02:00
Daniel Molkentin
d53eaf8fd6 Win32: Remove confusing option to remove AppData 
- This only works for the current user (while being a HKLM installer)
- The naming is confusing.

Fixes #3461
 2015-07-16 16:22:00 +02:00
Klaas Freitag
201d397391 CMocka tests: install the test utilities with make install. 2015-07-08 18:13:39 +02:00
Olivier Goffart
8bcd0261dc Merge remote-tracking branch 'origin/1.8' 
Conflicts:
	VERSION.cmake
 2015-06-15 14:03:46 +02:00
Jocelyn Turcotte
7a7bf4c561 NSIS: Force an update of the shell_extension #3320 
Since our DLLs version number aren't bumped, a same file size could
cause a DLL not to be installed to replace an old one.
This eventually can cause a crash of explorer if an incompatible version
of OCUtil.dll is installed alone.

Fix the issue by defining LIBRARY_IGNORE_VERSION. This also makes sure
that installing an old version of the client over a more recent one
if we decide to add version numbers to those DLLs.
 2015-06-10 17:01:08 +02:00
Daniel Molkentin
f9659d80c9 Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin" 
This reverts commit e1a36b53dc.
 2015-06-05 09:17:46 +02:00
Daniel Molkentin
553e831121 Revert "Adjust to new version of NSIS UAC" 
This reverts commit 1d600ceecc.
 2015-06-05 09:17:39 +02:00
Daniel Molkentin
e9ff471e1c Revert "NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true." 
This reverts commit 0f7773ff99.
 2015-06-05 09:16:14 +02:00
Daniel Molkentin
eb6d29a223 Revert "NSIS: Fix NSIS error handling" 
This reverts commit 3df26ef189.
 2015-06-05 09:15:14 +02:00
Daniel Molkentin
3df26ef189 NSIS: Fix NSIS error handling 2015-06-05 08:45:23 +02:00
Daniel Molkentin
0f7773ff99 NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true. 2015-06-04 12:53:42 +02:00
Daniel Molkentin
1d600ceecc Adjust to new version of NSIS UAC 2015-06-03 08:21:10 +02:00
Daniel Molkentin
e1a36b53dc NSIS: depend on nsProcess instead of Processes NSIS plugin 
The Processes plugin is no longer maintained, and OBS
compiles an up-to-date version of nsProcess for us.
 2015-06-03 08:21:10 +02:00
Olivier Goffart
6b27d2e703 Merge remote-tracking branch 'origin/1.8' 2015-05-26 12:28:31 +02:00
Daniel Molkentin
793130a533 Win32: Make Setup/Update Mutex theme-unique (2/2) 
Fixes #3272
 2015-05-25 21:54:03 +02:00
Daniel Molkentin
070d9d3147 NSIS Installer: Fix Basque, Galician, Slovak, Turkish 
Not sure when this broke, but those languages could never have worked...
 2015-05-25 21:48:21 +02:00
Daniel Molkentin
9b73308edd NSIS: Add Norwegian (Bokmål) translation 2015-05-25 21:41:23 +02:00
Daniel Molkentin
e708c145fa Win32: Make Setup/Update Mutex theme-unique 
Fixes #3272
 2015-05-23 09:40:31 +02:00
Klaas Freitag
34593cccb6 Remove QtConcurrent from component list for Qt4. 
According to Olivier QtConcurrent was part of QtCore in Qt4.
 2015-05-20 17:00:27 +02:00
Markus Goetz
63294f0702 Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin" 
This reverts commit 8dd374fc2b.

https://github.com/owncloud/client/issues/3254
 2015-05-20 12:33:17 +02:00
Daniel Molkentin
9693048f78 Find & use QtConcurrent 2015-05-19 17:09:39 +02:00
Daniel Molkentin
8dd374fc2b NSIS: depend on nsProcess instead of Processes NSIS plugin 
The Processes plugin is no longer maintained, and OBS
compiles an up-to-date version of nsProcess for us.
 2015-03-13 14:04:16 +01:00
Daniel Molkentin
457f9b587d Merge remote-tracking branch 'origin/1.8' 
Conflicts:
	src/gui/sharedialog.cpp
	src/gui/sharedialog.h
 2015-03-13 14:03:03 +01:00
Daniel Molkentin
227ed8ae07 win32: libproxy is not needed 2015-03-06 15:47:15 +01:00
Lukas Reschke
bd8b7cdff2 Bump Copyright year to 2015 
Otherwise the copyright meta-info of the application shows 2014
 2015-03-06 11:54:03 +01:00
Olivier Goffart
276dd50650 Update GetGitRevisionDescription.cmake 
From https://github.com/rpavlik/cmake-modules
 2015-02-20 10:11:30 +01:00
Jocelyn Turcotte
4f4ae5861a Enable c++11 regardless of the compiler detection 
CMake is using "c++" as the compiler and the clang detection fails.
Since we require C++11 at this point, enable it in all cases.

Removed the MSVC todos since we don't plan supporting it yet.
 2015-02-17 18:20:15 +01:00
Daniel Molkentin
fedf368c7a Merge pull request #2849 from owncloud/nsis_shortcuts_all_users 
Install shortcuts for all users
 2015-02-17 18:13:11 +01:00
Daniel Molkentin
c5f78fab51 Make NSIS installer with /S fully silent 
Addresses #2006
 2015-02-17 17:59:14 +01:00
Daniel Molkentin
56a907128a Install shortcuts for all users 
Implements #2413
 2015-02-17 17:17:39 +01:00
Daniel Molkentin
d3103adbd8 Ship translations on Windows again after rename 2015-02-07 22:32:42 +01:00
Olivier Goffart
11f1229c31 Fix Qt4 build 2015-02-04 18:04:50 +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
68ec24797b Add some define. 
Since Qt5.4, on release build, qDebug do not provide anymore the line
number unless we define QT_MESSAGELOGCONTEXT

Also define QT_USE_QSTRINGBUILDER while i'm on it (free optimisation)
 2015-02-04 13:43:02 +01:00
Daniel Molkentin
6c0a449ebe NSIS: Fix c&p error 2015-01-29 15:25:14 +01:00
Daniel Molkentin
183b3c61e4 Update NSIS installer to install ContextMenu Extension 2015-01-29 13:19:54 +01:00
Daniel Molkentin
2c432e0b97 Remove socketapiclient 2015-01-28 11:13:38 +01:00
Daniel Molkentin
2a3df5562c Add new Qt 5.4 dependencies, remove neon ones 2015-01-28 08:34:09 +01:00
Daniel Molkentin
f284786749 Fix typo 2015-01-23 14:44:53 +01:00
Daniel Molkentin
39097980b0 Deployment: Accessiblewidgets no longer exists in Qt 5.4 
Part of #2699
 2015-01-22 15:27:19 +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
Daniel Molkentin
aeb1f10621 NSIS: Reload shell after registering shellextension, use blackslashes 
It also registers and unregisters the shell extensions properly and
forces explorer to reload/unload the DLLs so they can be removed.
This obsoletes #2377.

Fixes #2487
Fixes #2377
 2014-12-09 23:52:07 +01:00
Christian Kamm
4d7b8bdb25 Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	OWNCLOUD.cmake
	test/CMakeLists.txt
	test/testfolderwatcher.h
 2014-11-19 14:45:25 +01:00
Christian Kamm
3a448fda91 Windows mingw32: Fix finding of windres binary. 2014-11-19 14:16:56 +01:00
Daniel Molkentin
1e94161ec1 Revert "Install shortcuts for all users" 2014-11-15 21:04:33 +01:00
Daniel Molkentin
02e96484a8 Install shortcuts for all users 2014-11-15 17:07:39 +01:00
Daniel Molkentin
cdac8d56d5 Merge remote-tracking branch 'origin/master' into crashreporter 
Conflicts:
	src/libsync/utility.cpp
	src/libsync/utility.h
 2014-11-11 23:53:38 +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