chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-21 15:46:15 +02:00
Code Activity
7,272 Commits 4 Branches 173 Tags
v1.8.0-beta1
Commit Graph
335 Commits
Author SHA1 Message Date
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 TurcotteandJocelyn 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 TurcotteandJocelyn 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
Christian Kamm 7ae0338f5c Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/socketapi.h
	src/libsync/syncengine.h
	test/CMakeLists.txt
 2014-10-22 10:41:55 +02:00
Daniel Molkentin 6048a7143a Revert "Remove references to qsqlite3" 
QtWebkit needs it

This reverts commit b1c10c8454.
 2014-10-20 10:27:34 +02:00
Daniel Molkentin 271cdac474 Really use internal SQLite on Windows 2014-10-19 08:51:01 +02:00
Daniel Molkentin 3021fb546e NSIS: Fix copying of qtbase translations 2014-10-17 16:37:37 +02:00
Daniel Molkentin 52a5729298 Merge pull request #2319 from owncloud/sqlite_capi 
Introduce a common sqlite layer across csync and mirall.

This avoids conflicts that both each load different and/or updated sqlite versions.
 2014-10-17 12:11:27 +02:00
Markus Goetz b1c10c8454 Remove references to qsqlite3 2014-10-16 17:51:17 +02:00
Markus Goetz 1d5b3aadea sqlite3: Bundle 3.8.6 for Mac and Windows 
it is linked into ocsync.
 2014-10-16 17:38:45 +02:00
Daniel Molkentin 4527784905 Second part of #1661 
- QT_INSTALL_TRANSLATIONS was not defined in Qt5
- Some languages have been split up in multiple qm's. We only need qtbase for now
 2014-10-16 11:08:29 +02:00
Olivier Goffart b20752f13e Fix the build with clang and Qt4 2014-10-09 17:54:46 +02:00
Daniel Molkentin 9d5d6aff38 Q_DECL_OVERRIDE for Qt4 only for GCC >= 4.7 2014-10-08 18:55:41 +02:00
Markus Goetz 2ba007ee4f CMake: Add else() case for Qt detection 2014-10-07 14:46:55 +02:00
Daniel Molkentin 78d50f4033 CPack is still needed for Windows 
This partially reverts commit dafd9c308f.
This partially reverts commit 7f836cc01b.
 2014-10-01 21:16:18 +02:00
Daniel Molkentin 7f836cc01b Kill obsolete Mac deployment code 2014-10-01 12:35:21 +02:00
Jürgen Weigert 637fb449c6 Fixed https://github.com/owncloud/mirall/issues/1699 
Added missing copyright headers.
 2014-09-18 12:30:42 +02:00
Jürgen Weigert c3d41f0d48 Fixed https://github.com/owncloud/mirall/issues/1699 
Missing copyright headers added.
 2014-09-18 12:26:55 +02:00
Dominik Schmidt ef70052b0e Package installer if it was built 2014-08-30 14:12:40 +02:00
Klaas Freitag bcff1ced5e Merge branch '1.7' 
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/folderman.cpp
	src/gui/wizard/owncloudadvancedsetuppage.cpp
	src/libsync/account.cpp
 2014-08-29 20:40:33 +02:00
Daniel Molkentin cc5f5cf3a6 Set the minimum supported OS X version to 10.7 
We dropped 10.6 support quite a while ago.
This should avoid bug reports from 10.6 users.

Fixes #2122
 2014-08-28 14:50:00 +02:00
Daniel Molkentin 902bb7a198 Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 
Conflicts:
	src/CMakeLists.txt
	src/gui/accountsettings.cpp
	src/gui/folderwizard.cpp
	src/gui/settingsdialog.cpp
	src/libsync/syncengine.h
 2014-08-26 11:29:42 +02:00
Daniel Molkentin c60b433c42 create shellext path 2014-08-21 20:33:25 +02:00
Daniel Molkentin 933c7e36d1 NSIS: fix target path for shell extension 2014-08-21 17:33:22 +02:00
Daniel Molkentin ccf532672b Use InstallLib to install the overlay icons 
This allows for a cleaner expirience
 2014-08-20 16:07:22 +02:00
Daniel Molkentin 4fc044d368 Merge branch 'master' into move_lib_to_sep_dir 
Conflicts:
	cmake/modules/NSIS.template.in
	src/CMakeLists.txt
	src/creds/shibboleth/authenticationdialog.cpp
	src/creds/shibboleth/authenticationdialog.h
	src/gui/owncloudgui.cpp
	src/libsync/creds/shibboleth/authenticationdialog.cpp
	src/libsync/creds/shibboleth/authenticationdialog.h
	src/libsync/mirallaccessmanager.cpp
	src/mirall/authenticationdialog.cpp
	src/mirall/authenticationdialog.h
 2014-08-12 21:08:44 +02:00
Daniel Molkentin 57ef515def Use std=c++0x instead of c++11 
Required for compat with Ubuntu 12.04, and possibly RHEL.
 2014-08-11 15:46:45 +02:00
Markus Goetz acd3df33b6 Merge branch 'long_running_put' into il 2014-08-08 12:00:26 +02:00
Markus Goetz 1bc8fd9b49 CMake: Don't need translations with token auth compile 2014-08-08 11:59:14 +02:00
Daniel Molkentin fa8f6f91c4 NSIS: Add a packaging routine for the overlay icons 2014-08-07 15:54:39 +02:00
Daniel Molkentin f06019ab81 NSIS: First steps at installing the shell extension 2014-08-06 10:44:17 +02:00
Daniel Molkentin 8b1aebcdba No need to ship the Qt4-based qtkeychain DLL 2014-08-05 13:11:15 +02:00
Markus Goetz f004d5085d Merge remote-tracking branch 'origin/1.6' into il 
Conflicts:
	VERSION.cmake
 2014-07-25 12:37:27 +02:00
Daniel MolkentinandKlaas Freitag f84e0010ee NSIS: ICU rebumped to 5.3 as per build service change 2014-07-24 10:07:46 +02:00