chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-26 22:42:44 +01:00
Code
11,117 Commits 4 Branches 173 Tags 91 MiB
v2.4.0-alpha1
Commit Graph

310 Commits

Author SHA1 Message Date
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