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
8,599 Commits 4 Branches 173 Tags 91 MiB
v2.0.2-rc1
Commit Graph

278 Commits

Author SHA1 Message Date
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
Olivier Goffart
8bcd0261dc Merge remote-tracking branch 'origin/1.8' 
Conflicts:
	VERSION.cmake
 2015-06-15 14:03:46 +02:00
Jocelyn Turcotte
7a7bf4c561 NSIS: Force an update of the shell_extension #3320 
Since our DLLs version number aren't bumped, a same file size could
cause a DLL not to be installed to replace an old one.
This eventually can cause a crash of explorer if an incompatible version
of OCUtil.dll is installed alone.

Fix the issue by defining LIBRARY_IGNORE_VERSION. This also makes sure
that installing an old version of the client over a more recent one
if we decide to add version numbers to those DLLs.
 2015-06-10 17:01:08 +02:00
Daniel Molkentin
f9659d80c9 Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin" 
This reverts commit e1a36b53dc.
 2015-06-05 09:17:46 +02:00
Daniel Molkentin
553e831121 Revert "Adjust to new version of NSIS UAC" 
This reverts commit 1d600ceecc.
 2015-06-05 09:17:39 +02:00
Daniel Molkentin
e9ff471e1c Revert "NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true." 
This reverts commit 0f7773ff99.
 2015-06-05 09:16:14 +02:00
Daniel Molkentin
eb6d29a223 Revert "NSIS: Fix NSIS error handling" 
This reverts commit 3df26ef189.
 2015-06-05 09:15:14 +02:00
Daniel Molkentin
3df26ef189 NSIS: Fix NSIS error handling 2015-06-05 08:45:23 +02:00
Daniel Molkentin
0f7773ff99 NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true. 2015-06-04 12:53:42 +02:00
Daniel Molkentin
1d600ceecc Adjust to new version of NSIS UAC 2015-06-03 08:21:10 +02:00
Daniel Molkentin
e1a36b53dc 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-06-03 08:21:10 +02:00
Olivier Goffart
6b27d2e703 Merge remote-tracking branch 'origin/1.8' 2015-05-26 12:28:31 +02:00
Daniel Molkentin
793130a533 Win32: Make Setup/Update Mutex theme-unique (2/2) 
Fixes #3272
 2015-05-25 21:54:03 +02:00
Daniel Molkentin
070d9d3147 NSIS Installer: Fix Basque, Galician, Slovak, Turkish 
Not sure when this broke, but those languages could never have worked...
 2015-05-25 21:48:21 +02:00
Daniel Molkentin
9b73308edd NSIS: Add Norwegian (Bokmål) translation 2015-05-25 21:41:23 +02:00
Daniel Molkentin
e708c145fa Win32: Make Setup/Update Mutex theme-unique 
Fixes #3272
 2015-05-23 09:40:31 +02:00
Klaas Freitag
34593cccb6 Remove QtConcurrent from component list for Qt4. 
According to Olivier QtConcurrent was part of QtCore in Qt4.
 2015-05-20 17:00:27 +02:00
Markus Goetz
63294f0702 Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin" 
This reverts commit 8dd374fc2b.

https://github.com/owncloud/client/issues/3254
 2015-05-20 12:33:17 +02:00
Daniel Molkentin
9693048f78 Find & use QtConcurrent 2015-05-19 17:09:39 +02:00
Daniel Molkentin
8dd374fc2b 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-03-13 14:04:16 +01:00
Daniel Molkentin
457f9b587d Merge remote-tracking branch 'origin/1.8' 
Conflicts:
	src/gui/sharedialog.cpp
	src/gui/sharedialog.h
 2015-03-13 14:03:03 +01:00
Daniel Molkentin
227ed8ae07 win32: libproxy is not needed 2015-03-06 15:47:15 +01:00
Lukas Reschke
bd8b7cdff2 Bump Copyright year to 2015 
Otherwise the copyright meta-info of the application shows 2014
 2015-03-06 11:54:03 +01:00
Olivier Goffart
276dd50650 Update GetGitRevisionDescription.cmake 
From https://github.com/rpavlik/cmake-modules
 2015-02-20 10:11:30 +01:00
Jocelyn Turcotte
4f4ae5861a Enable c++11 regardless of the compiler detection 
CMake is using "c++" as the compiler and the clang detection fails.
Since we require C++11 at this point, enable it in all cases.

Removed the MSVC todos since we don't plan supporting it yet.
 2015-02-17 18:20:15 +01:00
Daniel Molkentin
fedf368c7a Merge pull request #2849 from owncloud/nsis_shortcuts_all_users 
Install shortcuts for all users
 2015-02-17 18:13:11 +01:00
Daniel Molkentin
c5f78fab51 Make NSIS installer with /S fully silent 
Addresses #2006
 2015-02-17 17:59:14 +01:00
Daniel Molkentin
56a907128a Install shortcuts for all users 
Implements #2413
 2015-02-17 17:17:39 +01:00
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 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 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