mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 15:06:08 +03:00
Code Issues Projects Releases Packages Wiki Activity
19959 commits 473 branches 256 tags 514 MiB
Commit graph

159 commits

Author SHA1 Message Date
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
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
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
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
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
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
Dominik Schmidt
ef70052b0e Package installer if it was built 2014-08-30 14:12:40 +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
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
Olivier Goffart
8a88ca6f34 Merge branch 'il' 
Conflicts:
	src/mirall/propagator_legacy.h
 2014-07-18 17:00:38 +02:00
Daniel Molkentin
7ff62bc577 NSIS: ICU rebumped to 5.3 as per build service change 2014-07-17 14:57:04 +02:00
Klaas Freitag
d8ebebaf12 WinInstaller: No hardcoded www in front of the url on final page. 2014-07-16 18:39:51 +02:00
Daniel Molkentin
ea690c285b Make NSIS installer work with new structure 2014-07-14 13:12:31 +02:00
Daniel Molkentin
2961c44bbe NSIS: look for socketapiclient in the right place 2014-07-03 09:35:45 +02:00
Daniel Molkentin
997559dc6d NSIS: fix typo 2014-07-03 09:17:08 +02:00
Daniel Molkentin
6bc425f981 NSIS: Add socketapiclient 2014-07-02 12:05:23 +02:00
Daniel Molkentin
c855b783d9 NSIS: Remove duplicated entry 2014-06-20 15:53:10 +02:00
Daniel Molkentin
f593fc8e4d NSIS: Bump required libpng version to 16 2014-06-20 15:50:42 +02:00
Daniel Molkentin
9ca82ba14d NSIS: add libwinpthread dependency 2014-06-20 14:58:05 +02:00
Daniel Molkentin
b814b45e50 Add version and product information to installer properties 2014-06-05 11:51:12 +02:00
Daniel Molkentin
411cffd3d5 NSIS: libcrypto-10 dependency got lost somehow 2014-03-26 09:10:01 +01:00
Daniel Molkentin
4bf0a2b188 NSIS: depend on Qt5-based installations 2014-03-25 19:04:05 +01:00
Daniel Molkentin
d10aec6055 NSIS: Install owncloudcmd on Windows 2014-03-18 23:56:50 +01:00
Daniel Molkentin
4db7b5f2a7 NSIS: accept /noautoupdate 2014-02-12 17:57:50 +01:00
Daniel Molkentin
958253bb2b Respect skipUpdate policy from global config files and windows policy. 2014-02-12 17:55:05 +01:00
Thomas Müller
0322a44be5 Adding quotes - necessary for themes containing spaces in APPLICATION_NAME 2014-02-11 11:24:10 +01:00
Thomas Müller
fdf73fe539 - Replace undeclared variables: 
- PageReinstall_OLD_MUI_HEADER_TEXT_SUBTITLE
  - PageReinstall_OLD_Field_2
  - PageReinstall_OLD_Field_3
  - REVISION
- README.md updated - calling bin/l10n.sh was missing

This commit includes updated translations from transifex.
 2014-02-05 12:01:36 +01:00
Daniel Molkentin
815efb69d7 NSIS: implement /launch for updater 2014-01-23 17:17:13 +01:00
Daniel Molkentin
1d32fb74f9 NSIS: Don't try to log 2014-01-23 16:15:46 +01:00
Daniel Molkentin
f98db9ac9d NSIS: find DLL from csync copy within cmake 2014-01-23 15:55:55 +01:00
Daniel Molkentin
28c4cd9caa NSIS: Cleanup: Use MEMENTO defines where possible 2014-01-18 00:06:58 +01:00
Daniel Molkentin
2a0f28208c NSIS: Don't install link to Desktop of a link by the same name already exists 
Unfortunately, we cannot determine the target path for the .lnk file
without pulling in closed source plugins (or write our own), a length
I am not willing to go in the light of MSI.

Fixes #356
 2014-01-18 00:01:44 +01:00
Daniel Molkentin
77610eb184 NSIS: Only remove sections that we actually installed 
We can query the NSIS Memento extension for that.
 2014-01-17 23:51:52 +01:00
Daniel Molkentin
4c7ddb769a NSIS: INSTALL_PATH has never been used 
Remove it to avoid confusion
 2014-01-17 12:11:19 +01:00
Daniel Molkentin
91345d9e25 NSIS: Fix transations in uninstaller 
Before, we could not show custom strings at all
 2014-01-17 12:11:19 +01:00
Thomas Müller
900397c05e fixes #1305 
Installer will fallback to English in case there are no translations available for the current system language
 2013-12-20 10:02:30 +01:00
Daniel Molkentin
93d75932ac NSIS: fix c&p error. 2013-12-12 10:46:37 +01:00
Daniel Molkentin
8491d95ca4 NSIS: English must be enumerated, too 
Fixes empty strings in installer.
 2013-12-12 10:46:13 +01:00
Thomas Müller
f05e998430 Translation SectionGroup Shortcuts 2013-12-10 18:08:07 +01:00
Thomas Müller
13f5d29c3c No language selection dialog - use Windows GUI langaage, which is default as of today with NSIS 2013-12-10 11:10:48 +01:00
Thomas Müller
d82a9423d6 adding Turkish translation to installer 2013-12-10 09:59:23 +01:00
Thomas Müller
b41feebcdd Multi-lingual installer 2013-12-10 00:43:58 +01:00
Daniel Molkentin
f5e8efd435 Add build number into versioning scheme 
This is an enabler to improve update experience
 2013-12-09 16:39:13 +01:00
Thomas Müller
ec075a6d2a removing libiniparder.dll and libdl.dll from NSNIS installer 2013-12-02 13:20:10 +01:00
Daniel Molkentin
5d6700c68d Merge pull request #1165 from csware/startmenu-according-to-ms-guidelines 
Startmenu according to ms guidelines
 2013-11-25 04:27:43 -08:00
Daniel Molkentin
e20f39f040 Another cleanup 2013-11-14 19:31:38 +01:00
Daniel Molkentin
c2eaf5e627 owncloud is no longer a dl'opened module, but linked into csync 2013-11-14 19:22:22 +01:00
Sven Strickroth
ed5b0973dd Do not create folder for single link 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2013-11-14 15:45:14 +01:00
Sven Strickroth
336e22233d Do not create uninstall shortcut in start menu 
According to Microsoft Design guidelines (http://msdn.microsoft.com/en-us/library/windows/desktop/aa511447.aspx) no icons for uninstallers should be created.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2013-11-14 14:40:21 +01:00
Daniel Molkentin
475a4f2676 Windows: ship QtSql lib 2013-11-13 14:32:09 +01:00
Daniel Molkentin
763cb43e46 Add qsqlite plugin on Windows 2013-10-04 12:45:17 +02:00
Daniel Molkentin
3577ba2981 Fix httpbf/neon linkage 2013-09-10 19:50:44 +02:00
Daniel Molkentin
48b4c57d92 Use shared version of libhttpbf, package it on win 2013-09-10 14:45:08 +02:00
Daniel Molkentin
30b2406533 Fix windows packaging 2013-08-23 15:37:24 +02:00
Daniel Molkentin
c323041040 NSIS: install libjpeg for qjpeg4.dll 2013-08-08 15:39:34 +02:00
Daniel Molkentin
a493f81ec2 Windows Installer: Add jpeg,gif,ico image formats 2013-08-07 16:24:10 +02:00
Daniel Molkentin
85a832fb7c NSIS: Add WebKit dll 2013-08-05 23:25:14 +02:00
Daniel Molkentin
ce851a7a8b Use wildcards for translations, so they are always up-to-date 2013-08-01 15:28:06 +02:00
Daniel Molkentin
be65f78174 Fix win32 installer 2013-07-31 08:35:13 +02:00
Daniel Molkentin
ae2e3e7fb1 Remove autostart option from Windows installer 
now handled by the application
 2013-07-15 11:05:14 +02:00
Daniel Molkentin
1ca8ebebd9 Do not add shortcuts to non-existent files 2013-04-23 17:19:27 +02:00
fastfwd
6695b50965 Fix Issue #382 
Just a couple of typo/cut-and-paste errors.
 2013-04-22 01:22:16 -07:00
Daniel Molkentin
1c6523bcec Add plugin for screenreader support 2013-03-21 17:49:03 +03:00
Daniel Molkentin
dbec98ff48 Manual update of avail translations 2013-02-21 18:35:33 +03:00
Klaas Freitag
7734656ae3 Make mirall packager for win bundle the new openSSL dlls. 2013-02-05 14:37:39 +01:00
Daniel Molkentin
a04cf32a69 No need to ship ocsync.conf 2013-01-30 09:48:45 +01:00
Daniel Molkentin
bfee6402a6 Simplify NSIS template 2013-01-25 12:56:00 +01:00
Daniel Molkentin
635cb4dc7c NSIS: Remove GnuTLS remainders 2013-01-16 14:41:12 +01:00
Daniel Molkentin
5c495265f4 Consolidate theming support. 
This implements out-of-repository-theming, and removes the old
custom.ini theming that never worked on all platforms and had
no straight deployment story.

The new approach requires the CMAKE variable OEM_THEME_DIR to
point to a directory that must at least contain an OEM.cmake file
(check OWNCLOUD.cmake for possible options) as well as a themes.qrc
and a themes/ directory that directly correspond to the ones in
the source tree.
 2013-01-10 17:16:59 +01:00
Daniel Molkentin
ff1706c729 Add libqtkeychain dll to NSIS 2012-12-06 17:53:04 +01:00
Daniel Molkentin
4fbfe7bfef Installer: Only show license on special request 
GPL is a distribution license, and should thus
not be required to be accepted upon installation.
 2012-11-02 16:14:33 +01:00
Daniel Molkentin
aad21c8c4a Add license to Windows installer 2012-10-12 14:44:21 +02:00
Daniel Molkentin
fdfafb6e70 NSI: add proper version of ocsync.conf 2012-10-09 01:40:43 +02:00
Klaas Freitag
736a8dc457 fixed name of the csync owncloud module. 2012-10-05 10:03:16 +02:00
Daniel Molkentin
af99be4cd5 NSIS: shut down binary before uninstall 2012-09-27 10:38:31 +02:00
Klaas Freitag
de60d53a78 Merge branch 'sslerrordialog' of https://github.com/sebasje/mirall into sebasje-sslerrordialog 
Conflicts:
	src/mirall/application.cpp
	src/mirall/application.h
	src/mirall/owncloudinfo.cpp
 2012-10-02 12:34:06 +02:00
Klaas Freitag
d09693f191 Read sync-exclude.lst from /etc/ownCloud, renamed from exclude.lst. 2012-09-27 13:16:14 +02:00
Daniel Molkentin
9d479f9061 Installers on Windows are called Setup 
Also remove bogus manual line break.
 2012-09-24 07:19:09 +02:00
Daniel Molkentin
783207fa40 At least the Program group should be in 'Minimal'. 2012-09-24 03:45:12 +02:00
Daniel Molkentin
ea123b1705 Fix typo 2012-09-24 03:44:32 +02:00
Daniel Molkentin
8233c0c82a Add autostart section 2012-09-24 03:44:03 +02:00
Daniel Molkentin
a05a4c3741 More templatization. 2012-09-21 13:10:55 +02:00
Daniel Molkentin
663a1886e9 CMake: Centralize all application-specific parameters. 2012-09-20 17:31:18 +02:00
Daniel Molkentin
8a56a90d16 NSIS: fix typo, expand variables properly. 2012-09-20 12:21:21 +02:00