mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,418 Commits 194 Branches 287 Tags 562 MiB
3e5d33da7f
Commit Graph

358 Commits

Author SHA1 Message Date
Hannah von Reth
5cce3eaf91 Plugins: Add a relative plugin search path on Linux 
This fixes installations where the client is not installed in the same prefix as Qt

Fixes: #7801
 2020-04-23 18:55:04 +02:00
Olivier Goffart
dc1070d02d Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	CHANGELOG.md
	VERSION.cmake
	src/gui/MacOSXBundleInfo.plist
	src/gui/folderstatusmodel.h
	src/gui/settingsdialog.cpp
 2020-02-25 11:45:27 +01:00
Hannah von Reth
d555f35b4e [CMAKE] QtKeychain provides a proper config file, no need to use a find script 2020-01-22 13:29:57 +01:00
Hannah von Reth
0359a6a1f0 Remove unneeded code 2020-01-22 13:29:33 +01:00
Hannah von Reth
6ed418abd0 Remove unused files 2020-01-22 13:29:33 +01:00
Hannah von Reth
b346e6a4ba Happy new Year! 2020-01-22 13:26:05 +01:00
Hannah von Reth
69f74a6398 [CMAKE] Cleanup cmocka tests 2020-01-20 12:19:57 +01:00
Hannah von Reth
bf8edc8374 [CMAKE] Use FindINotify provided by ecm 2020-01-09 15:39:32 +01:00
Hannah von Reth
6725cd5826 [CMAKE] Resolve some issues discovered during review 2020-01-09 15:39:32 +01:00
Hannah von Reth
f17b305151 [CMAKE] Do not create a deployable mac bundle during build 
This simplifies the cmake scripts and reduces build times
 2020-01-09 15:39:32 +01:00
Hannah von Reth
9a11f4e9f1 [CMAKE] Use KDECmakeSettings 2020-01-09 15:39:32 +01:00
Hannah von Reth
a6fba2d200 [CMAKE] Start using extra cmake modules 2020-01-09 15:39:32 +01:00
Olivier Goffart
4eeb6483b5 Merge remote-tracking branch 'origin/2.6' 2019-10-08 11:11:05 +02:00
Jürgen Weigert
c866ac138f Allow Dark Mode 
(cherry picked from commit 1e101cbc3a6933461d84bbe3b30581323f552287)
 2019-10-07 20:50:45 +02:00
Dominik Schmidt
fd98d8c05e Fix build with recent Clang (on Linux) 2019-08-27 09:24:29 +02:00
Christian Kamm
a09c9347d8 libcloudproviders: Fix version extraction #7235 2019-06-07 19:41:10 +02:00
Christian Kamm
2c0a379f3a Minimal libcloudproviders support #7209 
- Add it as an optional dependency for linux builds,
  controlled by WITH_LIBCLOUDPROVIDERS, which is enabled automatically
  if the dependencies are available. Note that >=0.3.0 is required.

- Add code to export sync folders through the library and to add a
  minimal "Settings..." menu action.

- Set up cloud provider registration by installing a file into a
  path like /usr/share/cloud-providers/.

- DBus name and path are derived from APPLICATION_REV_DOMAIN by default
  and may be overridden with APPLICATION_CLOUDPROVIDERS_DBUS_NAME and
  APPLICATION_CLOUDPROVIDERS_DBUS_PATH if necessary.
 2019-06-07 09:26:33 +02:00
Markus Goetz
652b52ef81 WebKit: Remove more from macOS and NSIS builds #6451 2019-04-27 11:37:51 +02:00
Markus Goetz
710a2af6b5 macOS: Opt out of dark mode for now #7043 2019-02-22 14:38:53 +01:00
Dominik Schmidt
5347808623 Fix icon name in Info.plist 2018-10-18 19:54:37 +02:00
Dominik Schmidt
f8e7df42a8 Simplify Sparkle handling in CMake 2018-10-11 13:09:35 +02:00
Dominik Schmidt
07e2230dd9 ECMAddAppIconMacro: Rename OUTFILE_BASE to OUTFILE_BASENAME and fix sidebar icon resolutions 2018-06-27 01:28:44 +02:00
Dominik Schmidt
b4b1409148 Fix app icon macro 2018-06-27 01:28:44 +02:00
Dominik Schmidt
4f96647bae Rename ocsync library to ${APPLICATION_EXECUTABLE}_csync 2018-06-20 11:23:16 +02:00
Dominik Schmidt
79ef892e71 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.
 2018-06-20 11:23:16 +02:00
Olivier Goffart
9a8078944f FindSql3.cmake: Add the input variable in the search path 
Issue #6278
 2018-06-04 11:44:09 +02:00
Markus Goetz
104f8c9ba2 NSIS: SVG imageformats plugin DLL #6515 2018-05-30 11:56:41 +02:00
Markus Goetz
7a776dbb6a NSIS: SVG DLL #6515 2018-05-30 11:56:41 +02:00
Christian Kamm
8f9f2b5462 Rename Placeholders to Virtual Files in code #6531 2018-05-23 09:57:00 +02:00
Dominik Schmidt
fe5e5fcb32 Fix for png2ico 2018-05-14 13:40:12 +02:00
Dominik Schmidt
0f57326057 Fix create_windows_icon_and_rc invocation for png2ico 2018-05-14 13:40:12 +02:00
Dominik Schmidt
886f31456a Add FindIcoTool.cmake 2018-05-14 13:40:12 +02:00
Dominik Schmidt
2d7841204c Support icotool in ECMAddAppIcon macro 2018-05-14 13:40:12 +02:00
Olivier Goffart
e0b554ada9 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-04-23 13:22:01 +02:00
Markus Goetz
b6f1ba38a6 Placeholders: Support for macOS #6290 2018-04-19 19:24:29 +02:00
Christian Kamm
9e8464e114 Merge branch 'placeholder-prototype' 2018-04-18 11:02:53 +02:00
Christian Kamm
70b4dc99dc NSIS: Register placeholder extension 
Also change the placeholder suffix config option to not include the dot,
the dotless form is needed in the nsis script.
 2018-04-18 10:27:51 +02:00
Markus Goetz
e9646364a0 macdeployqt: Adjust minimum version based on our Qt #5932 2018-04-03 21:31:02 +02:00
Markus Goetz
24e2c809e4 macOS: Fix .app icon 2018-03-22 16:30:22 +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
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