nextcloud
/
desktop
зеркало из https://github.com/nextcloud/desktop.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
12 733 коммитов 483 Ветки 256 Теги 503 MiB
Граф коммитов

431 Коммитов

Автор SHA1 Сообщение Дата
Oskar Kruschitz cf150caa2b
Merge branch 'master' into windows-large-app-icon 2018-09-05 13:24:08 +02:00
Oskar Kruschitz 2bfb99f174 Mac Application Icon 
Replaced ownCloud.icns with APPLICATION_ICON_NAME variable
 2018-09-05 11:57:26 +02:00
Oskar Kruschitz ea8676ad2c Larger Windows App Icon 
Newer Windows versions are also displaying a 256x256 icon. If this icon size is not present, the 48x48 icon is used, but not resized. This means there is a possibly large empty area around the icon.
 2018-08-28 10:06:28 +02:00
Markus Doits 2335688b68
allow to switch to the integrated gpu on MacOS 
without that key, the client automatically runs on the dedicated gpu (if
present). now it allows the system to use the integrated one.

closes #501
 2018-07-25 09:35:53 +02:00
Markus Goetz c04ae70cf5
NSIS: SVG imageformats plugin DLL #6515 2018-06-13 14:57:31 +02:00
Markus Goetz ae36f36d56
NSIS: SVG DLL #6515 2018-06-13 14:57:30 +02:00
Olivier Goffart fbc1747168
Fix a bunch of warning with clang 
The option -Wno-discarded-qualifiers only exists with GCC, clang warns that
it has no effects.

Also it warns when some virtual fuction are marked with override but not
all of them.
 2018-06-06 20:31:14 +02:00
Markus Goetz 0d182280c4
macdeployqt: Adjust minimum version based on our Qt #5932 2018-06-04 20:02:43 +02:00
Roeland Jago Douma 48bce4c6b0
Merge remote-tracking branch 'oc/master' into oc_up 2018-01-25 11:17:04 +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 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 1f12d6344b Fix sqlite compilation (on OSX) 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 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
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