nextcloud
/
desktop
Π·Π΅Ρ€ΠΊΠ°Π»ΠΎ ΠΈΠ· https://github.com/nextcloud/desktop.git
1
0
Π€ΠΎΡ€ΠΊΠ½ΡƒΡ‚ΡŒ 0
Код Π—Π°Π΄Π°Ρ‡ΠΈ ΠŸΠ°ΠΊΠ΅Ρ‚Ρ‹ ΠŸΡ€ΠΎΠ΅ΠΊΡ‚Ρ‹ Π Π΅Π»ΠΈΠ·Ρ‹ Π’ΠΈΠΊΠΈ ΠΠΊΡ‚ΠΈΠ²Π½ΠΎΡΡ‚ΡŒ
18Β 107 ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ² 478 Π’Π΅Ρ‚ΠΊΠΈ 255 Π’Π΅Π³ΠΈ 494 MiB
Π“Ρ€Π°Ρ„ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ²

474 ΠšΠΎΠΌΠΌΠΈΡ‚ΠΎΠ²

Автор SHA1 Π‘ΠΎΠΎΠ±Ρ‰Π΅Π½ΠΈΠ΅ Π”Π°Ρ‚Π°
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 Molkentin f84e0010ee NSIS: ICU rebumped to 5.3 as per build service change 2014-07-24 10:07:46 +02:00
Olivier Goffart 8a88ca6f34 Merge branch 'il' 
Conflicts:
	src/mirall/propagator_legacy.h
 2014-07-18 17:00:38 +02:00
Olivier Goffart 81d786733d Merge remote-tracking branch 'origin/1.6' into il 
Conflicts:
	VERSION.cmake
	src/mirall/propagator_qnam.cpp
	src/mirall/propagator_qnam.h
 2014-07-18 16:59:29 +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
Olivier Goffart 846773efd3 Define Q_DECL_OVERRIDE for Qt4 
That macro is new in Qt5, define it as well when compiling with Qt4
so we can use it in mirall

Note: QNetworkCookieJar::deleteCookie was not existing in Qt4.
 2014-07-09 23:31:56 +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
Olivier Goffart 92f07cb60f Enable C++11 
In order to avoid the warning
 warning: anonymous variadic macros were introduced in C99
Due to the use of variadic macro in the qDebug macro in Qt 5.3

C++11 requires a space between string literal and macro to avoid the
ambiguity with user defined litteral
 2014-06-25 12:01:27 +02:00
Olivier Goffart 3c4f410a4e cmake compilation flags: don't define -Wdeclaration-after-statement 
We are in 2014, let me use C99 already.
 2014-06-24 11:02:58 +02:00
Olivier Goffart 02704cdf74 Merge remote-tracking branch 'origin/1.6' into il 
Conflicts:
	VERSION.cmake
	csync/src/csync_statedb.c
	src/mirall/syncengine.cpp
	src/mirall/syncfileitem.h
 2014-06-23 12:48:34 +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
Markus Goetz be7b08b50a CMake: Fix token auth compile 2014-06-16 15:34:46 +02:00
Daniel Molkentin b814b45e50 Add version and product information to installer properties 2014-06-05 11:51:12 +02:00
Olivier Goffart 9f0848ba15 Merge remote-tracking branch 'origin/libowncloudsync_noqtgui' 2014-04-29 12:23:15 +02:00
Klaas Freitag 1af7dc952c Update to latest GNUInstallDirs cmake module 
This version correctly detects debians multiarch lib handling and
lets us remove the manually set CMAKE_LIB_INSTALL_DIRS from the rules
file.
 2014-04-23 13:04:16 +02:00
Markus Goetz f6711b2842 CMake: Find libraries also on Win host compile 2014-04-22 21:02:08 +02:00
Markus Goetz 77ac092975 WiP: Attempt to compile without UI 2014-04-21 19:57:15 +02:00
Klaas Freitag 7d79d3d30d Fix Search for Qt5 version Qt4 2014-04-08 12:08:01 +02:00
Daniel Molkentin 4ff39d8114 Cleanups, build if Qt5 is not on system 2014-04-07 18:08:28 +02:00
Daniel Molkentin 9f8d867ce2 About correctly when Qt5Keychain isn't found 2014-04-07 17:41:33 +02:00
Daniel Molkentin d416c97eac Fix Qt5 detection 2014-04-07 17:38:30 +02:00
Daniel Molkentin 7d7d03071a Add Copyright.txt for cmake modules 
Fixes #1438
 2014-04-07 01:27:59 +02:00
Daniel Molkentin 57c59850e1 Fix installation paths 2014-04-04 15:52:41 +02:00
Daniel Molkentin 4bcd620c29 Avoid build attempts with Qt4 on Windows and Linux 2014-04-04 09:29:01 +02:00
Daniel Molkentin 9822002480 Spell APPLICATION_SHORTNAME correctly 
Fixes #1547
 2014-03-28 15:56:35 +01:00
Daniel Molkentin 411cffd3d5 NSIS: libcrypto-10 dependency got lost somehow 2014-03-26 09:10:01 +01:00
Daniel Molkentin 7c7fad78f7 Qt5: QtLocation is not needed 2014-03-25 22:52:28 +01:00
Daniel Molkentin 1c8e5ef4ee Fix typo 2014-03-25 20:05:06 +01:00
Daniel Molkentin 45ec489f71 Merge branch 'master' of github.com:shadone/mirall into shadone-master 
Conflicts:
	cmake/modules/QtVersionAbstraction.cmake
	src/CMakeLists.txt
	src/mirall/owncloudgui.cpp
 2014-03-25 19:56:45 +01:00
Daniel Molkentin dddec8b250 -fPIC is implied on Windows 2014-03-25 19:04:05 +01:00
Daniel Molkentin 06082b585a Add translations when using Qt5 as well 2014-03-25 19:04:05 +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
Olivier Goffart 33289bde29 Merge remote-tracking branch 'origin/1.5' 
Conflicts:
	CMakeLists.txt
	VERSION.cmake
	src/CMakeLists.txt
 2014-03-14 17:27:50 +01:00
Daniel Molkentin 87f3755b1f Deploy with Qt5 2014-03-13 00:52:01 +01:00
Daniel Molkentin 3f4bcbbd62 Find Qt5 version of QtKeychain when built with Qt5 2014-03-12 18:38:59 +01:00
Daniel Molkentin 955b932806 Qt5: QtLocation is not required 2014-03-12 18:23:45 +01:00
Daniel Molkentin e7b6560c39 cmake: Remove debug 2014-03-12 18:20:45 +01:00
Daniel Molkentin 80e583c337 Error out if a Qt module is missing 
Fixes #1487
 2014-03-12 18:18:02 +01:00
Daniel Molkentin bc3d298491 Find QtKeychain on multiarch Debian/Ubuntu 2014-03-12 18:17:43 +01:00
Daniel Molkentin 28cf9ce1a4 Properly abort if QtKeychain is not found 
Fixes #1486
 2014-03-12 17:55:30 +01:00
Klaas Freitag aa4e90acfc Put ocsync to a private library - WIP 2014-03-11 10:18:07 +01:00
Denis Dzyubenko a51cb0982b Added Mac-specific settings dialog that looks more native 2014-02-18 02:22:16 +01:00
Daniel Molkentin beb9752f09 Merge remote-tracking branch 'origin/1.5' 2014-02-12 21:17:06 +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
Olivier Goffart a5379ef2aa make BUILD_WITH_QT4 off by default 
Rationale:
When Qt5 is not found, the script will automatically use Qt4.
However, without this change, when Qt4 is not found, it will not
try to find Qt5 because BUILD_WITH_QT4 is ON by default forbidding the
use of Qt5 even if it is installed.

Also, other packages default to Qt5 including qtkeychain

See also issue #1418
 2014-02-12 11:25:08 +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 60ca442728 Adding quotes - necessary for themes containing spaces in APPLICATION_NAME 2014-02-11 11:23:34 +01:00
Markus Goetz 43345dc236 Icon: Make png2ico / windres failure non-fatal 2014-02-10 14:36:32 +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
Markus Goetz e001e70816 Sparkle: Get it working 2014-02-04 17:37:01 +01:00
Daniel Molkentin 924e7d4e39 Mac OS: Make icns generation work when building with Qt 5 2014-02-04 08:50:45 +01:00
Daniel Molkentin cfdc6395d8 Find sparkle the first time around 2014-01-30 12:57:33 +01:00
Klaas Freitag f2fc866cc4 Set the library and bin install path to cmake standard path. 2014-01-24 13:43:05 +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
Klaas Freitag 9c300b83bd Add FindINotify cmake module. 2014-01-23 16:15:29 +01:00
Daniel Molkentin f98db9ac9d NSIS: find DLL from csync copy within cmake 2014-01-23 15:55:55 +01:00
Daniel Molkentin 484ad28cd6 Merge pull request #1357 from owncloud/nsis_fixes 
NSIS preparations for upgrade mode
 2014-01-22 07:20:53 -08:00
Daniel Molkentin 8303c8f909 Mac OS Bundle file: bump copyright year 2014-01-21 11:23:46 +01:00
Klaas Freitag 05b81bc7d8 rename csync/doc to csync/csync_doc to satisfy cmake. 
CMake throws a warning if there are two subdirs with the same name.
 2014-01-20 16:19:30 +01:00
Olivier Goffart 316aade340 Merge branch 'csync_merge' 
Conflicts:
	src/CMakeLists.txt
 2014-01-20 13:27:33 +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
Olivier Goffart c7227297af Make it compile with the merge of csync mirall 2014-01-15 12:20:03 +01:00
Klaas Freitag aba1252e60 Remove inotify from cmake files. 2014-01-14 15:06:06 +01:00
Olivier Goffart 924e0e3242 Merge csync inside the mirall repository 2014-01-13 14:43:14 +01:00
Olivier Goffart bf7ca60bec Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
Olivier Goffart ebee52ea8a Merge branch '1.5' 2014-01-09 12:32:08 +01:00
Daniel Molkentin f37f5ccf69 Display version in Mac OS Bundle again 2014-01-08 11:15:28 +01:00
Ville SkyttΓ€ 1c9a4784c7 Don't discard user CXXFLAGS, append to them instead. 2013-12-30 00:30:48 +02: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
Olivier Goffart f5c46d481c Tru to get NE_LFS properly 
The csync and mirall build system are slightly different so this might help
 2013-12-11 20:44:46 +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 31989d23a6 Adjust Windows and Mac binaries package names 2013-12-09 17:41:41 +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 5c4d240c66 Build on mac with Qt 5 
I still had this patch on disk.
 2013-11-19 14:41:40 +01: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
Klaas Freitag dbe63727a3 Quote regexp to hopefully not confuse cmake 2.6 2013-10-02 09:15:17 +02:00
Klaas Freitag 6a73fd984c Added missing cmake modules for cmake 2.6 2013-10-01 16:09:59 +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 6b9950a9a0 Qt5: DBUS is only needed for FDO 2013-09-05 18:41:49 +02:00
Daniel Molkentin 35ac6610c7 Compile with Qt5 on Linux 2013-09-05 17:13:31 +02:00
Klaas Freitag 8fe102662d Merge branch 'propagator-ng': Fixes to work with new LGPL ocsync. 
Conflicts:
	src/mirall/csyncthread.cpp
 2013-09-04 16:33:06 +02:00
Olivier Goffart bf6d0a521c Compile with Qt5 2013-08-28 20:58:22 +02:00
Olivier Goffart 336bbb2403 Compile with Qt4 2013-08-28 20:14:40 +02:00
Daniel Molkentin 73da086964 Initial changes to also build on Qt5, doesn't compile yet 2013-08-28 17:03:31 +02:00
Thomas MΓΌller 8bfb44fd28 Inverting the logic to set the prefix for SYSCONF_INSTALL_DIR 2013-08-26 22:42:17 +02:00
Daniel Molkentin 79d3b84fad Reintroduce workaround for /etc in root if files go to /usr 2013-08-26 21:59:52 +02:00
Daniel Molkentin 30b2406533 Fix windows packaging 2013-08-23 15:37:24 +02:00
Daniel Molkentin 42abf4101c Honor cmake's install prefix 
since the entire ting is so incredibly broken in cmake,
use the approach taken by csync (which emulates the
approach of autotools), to get the directories right.

This mandates changes in the theme, which need discussion
(APPLICATION_SHORTNAME must now equal appName(), and
APPLICATION_NAME should equal appGuiName()).
 2013-08-22 09:40:25 +02:00
Olivier Goffart b5ed352aa3 Merge remote-tracking branch 'origin/master' into ocsync 
Only confluct resolution, do not compile or works

Conflicts:
	CMakeLists.txt
	CPackConfig.cmake
	ConfigureChecks.cmake
	client/csync_client.c
	cmake/Modules/DefineCompilerFlags.cmake
	cmake/Modules/DefineInstallationPaths.cmake
	cmake/Modules/FindIconv.cmake
	cmake/Modules/FindIniparser.cmake
	cmake/Modules/FindNeon.cmake
	config.h.cmake
	config/CMakeLists.txt
	config/ocsync.conf
	doc/CMakeLists.txt
	modules/csync_owncloud.c
	modules/csync_sftp2.c
	src/CMakeLists.txt
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_exclude.c
	src/csync_lock.c
	src/csync_macros.h
	src/csync_misc.c
	src/csync_misc.h
	src/csync_private.h
	src/csync_propagate.c
	src/csync_statedb.c
	src/csync_statedb.h
	src/csync_update.c
	src/csync_util.c
	src/csync_util.h
	src/std/c_dir.c
	src/std/c_file.c
	src/std/c_private.h
	src/std/c_string.c
	src/std/c_string.h
	src/std/c_time.c
	src/vio/csync_vio.c
	src/vio/csync_vio.h
	src/vio/csync_vio_file_stat.h
	src/vio/csync_vio_local.c
	src/vio/csync_vio_method.h
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_treewalk.c
	tests/csync_tests/check_csync_update.c
	tests/ownCloud/HTTP/DAV.pm
	tests/ownCloud/ownCloud/Test.pm
	tests/std_tests/check_std_c_str.c
	tests/vio_tests/check_vio.c
 2013-08-18 16:21:18 +02:00
Olivier Goffart 0589bfc51b Merge branch 'master' into propagator-ng 
This just fix the conflict.
Do not compile or work yet

Conflicts:
	src/CMakeLists.txt
	src/mirall/csyncthread.cpp
	src/mirall/csyncthread.h
	src/mirall/owncloudfolder.cpp
	src/mirall/syncfileitem.h
	test/CMakeLists.txt
 2013-08-14 15:19:21 +02:00
Daniel Molkentin f054ca3f72 Disable Werror by default, set CSYNC_STRICT=ON to disable 2013-08-08 16:19:44 +02:00
Daniel Molkentin c323041040 NSIS: install libjpeg for qjpeg4.dll 2013-08-08 15:39:34 +02:00
Daniel Molkentin 6a6bfd1c89 Use proper compiler switch 2013-08-07 16:58:09 +02:00
Daniel Molkentin a493f81ec2 Windows Installer: Add jpeg,gif,ico image formats 2013-08-07 16:24:10 +02:00
Daniel Molkentin b08c1ada02 -Wno-long-long required due to Qt headers 2013-08-07 13:19:21 +02:00
Krzesimir Nowak 114f66f297 Add -Wall -Wextra -Wpedantic (or -pedantic) warnings by default. 
This also introduces a MIRALL_FATAL_WARNINGS to enable a -Werror for
GNU compilers and clang.

MSVC compilers are yet to be handled.
 2013-08-07 12:54:34 +02:00
Daniel Molkentin 85a832fb7c NSIS: Add WebKit dll 2013-08-05 23:25:14 +02:00
Daniel Molkentin 045a3f17ba _USE_GNU -> _GNU_SOURCE 2013-08-05 21:11:14 +02:00
Daniel Molkentin 575874bcbe asprintf is GNU specific 
Unless we have a replacement, use _USE_GNU
 2013-08-02 15:20:03 +02:00
Daniel Molkentin 8c9799cede Ignore false-positive compiler warnings 2013-08-02 15:19:41 +02:00
Daniel Molkentin ce851a7a8b Use wildcards for translations, so they are always up-to-date 2013-08-01 15:28:06 +02:00
Olivier Goffart 3cc41db0bd Fix warning with clang 
/usr/include/features.h:330:4: error: _FORTIFY_SOURCE requires compiling
with optimization (-O) [-Werror,-W#warnings]
 #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
 2013-08-01 13:13:05 +02:00
Daniel Molkentin 8d99364d63 Eliminate all warnings 
- use proper casts
- use aproproate types
- offer to build with -Werror
- make printf attribute hinting gnu format style
- remove unused helper methods
- begin to use inttyes.h macros where suitable
- move var declarations to the beginning of the method
- properly use _FILE_OFFSET_BITS
- silence variables unused depending on the define
 2013-07-31 13:12:10 +02:00
Daniel Molkentin be65f78174 Fix win32 installer 2013-07-31 08:35:13 +02:00
Andreas Schneider d80da2a088 LICENSE: Change license of libcsync from GPL to LGPL. 
All contributors have agreed to change the license of libcsync to LGPL.
 2013-07-29 14:04:37 +02:00
Andreas Schneider b6f9fdb96e cmake: Remove iniparser dependency. 
BUG: https://open.cryptomilk.org/issues/5
 2013-07-29 09:56:38 +02:00
Andreas Schneider 45cfcfc383 cmake: Pass _FORTIFY_SOURCE only to the precompiler. 2013-07-25 10:00:41 +02:00
Klaas Freitag fe706dc8f9 cmake: Check for existing header file in neon cmake module. 
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
 2013-07-23 07:52:49 +02:00
Klaas Freitag 0c3becfdb6 cmake: Fix make install on win32 platform. 
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
 2013-07-23 07:41:41 +02:00
Daniel Molkentin ae2e3e7fb1 Remove autostart option from Windows installer 
now handled by the application
 2013-07-15 11:05:14 +02:00
Andreas Schneider 341e0e8967 cmake: Fix iconv detection on FreeBSD. 2013-07-14 15:51:09 +02:00
Andreas Schneider bdb3772e8f cmake: Fix argument order of get_filename_component(). 2013-07-14 15:39:40 +02:00
Andreas Schneider 5599573e2f cmake: Fix getting filename components. 2013-07-14 15:38:10 +02:00
Andreas Schneider 6b189316ab cmake: Require at least version 3.3.9 for sqlite3_prepare_v2(). 2013-07-13 09:17:40 +02:00
Andreas Schneider 9382a047ae cmake: Update FindNeon and add support for version checking. 2013-07-12 11:57:07 +02:00
Andreas Schneider 81df0406eb cmake: Rewrite FindIconv from scratch. 
This version supports BSD correctly.
 2013-07-12 11:31:46 +02:00
Andreas Schneider cccbb6699a cmake: Find SMBClient correctly. 2013-07-04 10:29:48 +02:00
Andreas Schneider 3043b97815 cmake: Use pkg-config for libsmbclient. 2013-06-16 21:37:03 +02:00
Andreas Schneider d19a652993 cmake: Fix -D_FORTIFY_SOURCE detection. 2013-06-10 16:17:43 +02:00
Olivier Goffart e1e8842548 New owncloud propagator that skip the vio abstraction layer 
The vio abstraction layer within csync is inneficient for the owncloud
use case because not all calls maps well to the POSIX interface. We can
be much more efficient by doing exactly what we need.

Also, this will allow us to scedule better the calls and possibly to use
threads.
 2013-05-04 11:02:30 +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
Andreas Schneider 480c97c487 cmake: Update compiler flags. 2013-03-14 10:10:41 +01:00
Daniel Molkentin dbec98ff48 Manual update of avail translations 2013-02-21 18:35:33 +03:00
Daniel Molkentin 2b8925c210 FindNeon: Work on non-xbuilds as well 2013-02-08 16:08:29 +03:00
Daniel Molkentin 79159ae32c Remove debug line 2013-02-08 15:56:26 +03:00
Daniel Molkentin a6f63aea94 Safely detect neon-config in cross builds 2013-02-08 15:46:42 +03:00
Daniel Molkentin 9c0c693081 Add iconv support to convert charsets to different platforms. 2013-02-06 15:11:40 +01: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
Klaas Freitag 1385aab65d Changed FindCSync module to not check relative pathes + docu. 2013-01-22 15:08:56 +01:00
Klaas Freitag 1db825a733 Set path shortcuts for win32 as well. 2013-01-21 13:38:33 +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
Klaas Freitag ba21a9b3a2 Check if neon was built with LFS support. 2013-01-09 15:03:20 +01:00