[Pkg-owncloud-commits] [owncloud-client] 214/219: Merge tag 'upstream/1.7.0_beta3+dfsg'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Oct 11 14:43:28 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 81165af4af7b5376152b83617a0fd8be477053d9
Merge: 6b4e4d9 531a12b
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Tue Oct 7 01:49:50 2014 +0200
Merge tag 'upstream/1.7.0_beta3+dfsg'
Upstream version 1.7.0~beta3+dfsg
# gpg: Unterschrift vom Di 07 Okt 2014 01:49:49 CEST mittels RSA-Schlüssel ID 50605636
# gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"
.tag | 2 +-
CMakeLists.txt | 7 +
ChangeLog | 3 +-
VERSION.cmake | 2 +-
cmake/modules/DefineCMakeDefaults.cmake | 4 +
cmake/modules/DefineCompilerFlags.cmake | 4 +
cmake/modules/DefineInstallationPaths.cmake | 4 +
cmake/modules/DefinePlatformDefaults.cmake | 4 +
cmake/modules/FindINotify.cmake | 4 +
cmake/modules/FindPackageVersionCheck.cmake | 4 +
cmake/modules/FindPdfLatex.cmake | 4 +
cmake/modules/FindQt5Keychain.cmake | 4 +
cmake/modules/FindQtKeychain.cmake | 4 +
cmake/modules/FindSphinx.cmake | 4 +
cmake/modules/MacOSXBundleInfo.plist.in | 2 +
cmake/modules/MacroCopyFile.cmake | 4 +
cmake/modules/QtVersionAbstraction.cmake | 4 +
cmake/modules/UseDoxygen.cmake | 4 +
cmake/modules/Warnings.cmake | 4 +
csync/src/csync.c | 13 -
csync/src/csync.h | 1 +
csync/src/csync_exclude.c | 25 +-
csync/src/csync_exclude.h | 5 +
csync/src/csync_owncloud_util.c | 2 +
csync/src/csync_private.h | 3 +-
csync/src/csync_reconcile.c | 4 +
csync/src/csync_update.c | 52 +-
csync/src/vio/csync_vio_local.c | 2 +-
csync/tests/csync_tests/check_csync_exclude.c | 33 +
csync/tests/ownCloud/README | 11 +-
csync/tests/ownCloud/exclude.cfg | 4 +-
csync/tests/ownCloud/ownCloud/Test.pm | 28 +-
csync/tests/ownCloud/t1.cfg.in | 4 +-
csync/tests/ownCloud/t1.pl | 1 -
csync/tests/ownCloud/t2.pl | 2 +-
csync/tests/ownCloud/t3.pl | 2 +-
csync/tests/ownCloud/t4.pl | 20 +-
csync/tests/ownCloud/t5.pl | 2 +-
csync/tests/ownCloud/t6.pl | 2 +-
csync/tests/ownCloud/t7.pl | 6 +-
csync/tests/ownCloud/t8.pl | 2 +-
doc/conffile.rst | 6 +-
doc/owncloudcmd.1.rst | 20 +-
doc/owncloudcmd.rst | 27 +-
mirall.desktop.in | 1 +
shell_integration/MacOSX/CMakeLists.txt | 11 +
.../OwnCloud.xcworkspace/contents.xcworkspacedata | 10 +
.../xcshareddata/OwnCloud.xccheckout | 41 +
.../MacOSX/OwnCloudFinder/ContentManager.h | 47 +
.../MacOSX/OwnCloudFinder/ContentManager.m | 390 +
.../MacOSX/OwnCloudFinder/ContextMenuHandlers.h | 28 +
.../MacOSX/OwnCloudFinder/ContextMenuHandlers.m | 106 +
.../OwnCloudFinder/ContextMenuHandlers.m.unc | 74 +
.../OwnCloudFinder/English.lproj/InfoPlist.strings | 2 +
.../MacOSX/OwnCloudFinder/Finder/Finder.h | 1016 +++
.../MacOSX/OwnCloudFinder/FinderHook.h | 22 +
.../MacOSX/OwnCloudFinder/FinderHook.m | 125 +
.../MacOSX/OwnCloudFinder/GCDAsyncSocket.h | 1094 +++
.../MacOSX/OwnCloudFinder/GCDAsyncSocket.m | 7952 ++++++++++++++++++++
.../MacOSX/OwnCloudFinder/IconCache.h | 29 +
.../MacOSX/OwnCloudFinder/IconCache.m | 116 +
.../MacOSX/OwnCloudFinder/IconOverlayHandlers.h | 23 +
.../MacOSX/OwnCloudFinder/IconOverlayHandlers.m | 163 +
shell_integration/MacOSX/OwnCloudFinder/Info.plist | 46 +
shell_integration/MacOSX/OwnCloudFinder/JSONKit.h | 251 +
shell_integration/MacOSX/OwnCloudFinder/JSONKit.m | 3065 ++++++++
.../MacOSX/OwnCloudFinder/MenuManager.h | 29 +
.../MacOSX/OwnCloudFinder/MenuManager.m | 188 +
.../OwnCloudFinder.xcodeproj/project.pbxproj | 340 +
.../project.xcworkspace/contents.xcworkspacedata | 7 +
.../xcschemes/xcschememanagement.plist | 14 +
.../MacOSX/OwnCloudFinder/RequestManager.h | 40 +
.../MacOSX/OwnCloudFinder/RequestManager.m | 274 +
.../English.lproj/InfoPlist.strings | 2 +
.../MacOSX/OwnCloudInjector/Info.plist | 59 +
.../OwnCloudInjector/LNStandardVersionComparator.h | 35 +
.../OwnCloudInjector/LNStandardVersionComparator.m | 158 +
.../OwnCloudInjector/LNVersionComparisonProtocol.h | 27 +
.../MacOSX/OwnCloudInjector/OwnCloudInjector.m | 270 +
.../MacOSX/OwnCloudInjector/OwnCloudInjector.sdef | 9 +
.../OwnCloudInjector.xcodeproj/project.pbxproj | 269 +
.../project.xcworkspace/contents.xcworkspacedata | 7 +
.../xcschemes/OwnCloudFinder.osax.xcscheme | 73 +
.../xcschemes/xcschememanagement.plist | 14 +
.../MacOSX/OwnCloudInjector/license.txt | 25 +
shell_integration/MacOSX/check.scpt | 9 +
shell_integration/MacOSX/deploy.sh | 17 +
shell_integration/MacOSX/load.scpt | 6 +
shell_integration/MacOSX/loadPlugin.sh | 8 +
shell_integration/MacOSX/unload.scpt | 6 +
shell_integration/icons/CMakeLists.txt | 7 +-
shell_integration/nautilus/CMakeLists.txt | 3 +-
shell_integration/nautilus/ownCloud.py | 168 -
shell_integration/nautilus/syncstate.py | 194 +
.../OCShellExtensions/OCOverlays/DllMain.cpp | 204 +
.../OCShellExtensions/OCOverlays/OCOverlay.cpp | 187 +
.../OCShellExtensions/OCOverlays/OCOverlay.h | 50 +
.../OCShellExtensions/OCOverlays/OCOverlay.rc | Bin 0 -> 6122 bytes
.../OCOverlays/OCOverlayFactory.cpp | 91 +
.../OCOverlays/OCOverlayFactory.h | 48 +
.../OCOverlays/OCOverlayRegistrationHandler.cpp | 151 +
.../OCOverlays/OCOverlayRegistrationHandler.h | 31 +
.../OCShellExtensions/OCOverlays/OCOverlays.def | 6 +
.../OCOverlays/OCOverlays.vcxproj | 198 +
.../OCOverlays/OverlayConstants.h | 50 +
.../OCOverlays/OverlayConstants.h.original | 32 +
.../OCShellExtensions/OCOverlays/ico/Error.ico | Bin 0 -> 30166 bytes
.../OCOverlays/ico/Error_Shared.ico | Bin 0 -> 30166 bytes
.../OCShellExtensions/OCOverlays/ico/OK.ico | Bin 0 -> 30166 bytes
.../OCShellExtensions/OCOverlays/ico/OK_Shared.ico | Bin 0 -> 30166 bytes
.../OCShellExtensions/OCOverlays/ico/Sync.ico | Bin 0 -> 30166 bytes
.../OCOverlays/ico/Sync_Shared.ico | Bin 0 -> 30166 bytes
.../OCShellExtensions/OCOverlays/ico/Warning.ico | Bin 0 -> 30166 bytes
.../OCOverlays/ico/Warning_Shared.ico | Bin 0 -> 30166 bytes
.../OCShellExtensions/OCOverlays/resource.h | Bin 0 -> 1536 bytes
.../windows/OCShellExtensions/OCOverlays/stdafx.h | 30 +
.../OCShellExtensions/OCShellExtensions.sln | 41 +
.../OCUtil/CommunicationSocket.cpp | 129 +
.../OCShellExtensions/OCUtil/CommunicationSocket.h | 42 +
.../windows/OCShellExtensions/OCUtil/FileUtil.cpp | 84 +
.../windows/OCShellExtensions/OCUtil/FileUtil.h | 40 +
.../windows/OCShellExtensions/OCUtil/OCMessage.cpp | 74 +
.../windows/OCShellExtensions/OCUtil/OCMessage.h | 42 +
.../OCShellExtensions/OCUtil/OCUtil.vcxproj | 160 +
.../OCShellExtensions/OCUtil/ParserUtil.cpp | 389 +
.../OCShellExtensions/OCUtil/RegistryUtil.cpp | 70 +
.../OCShellExtensions/OCUtil/RegistryUtil.h | 35 +
.../OCShellExtensions/OCUtil/RemotePathChecker.cpp | 127 +
.../OCShellExtensions/OCUtil/RemotePathChecker.h | 42 +
.../OCShellExtensions/OCUtil/StringUtil.cpp | 32 +
.../windows/OCShellExtensions/OCUtil/StringUtil.h | 35 +
.../OCShellExtensions/OCUtil/UtilConstants.h | 30 +
.../OCShellExtensions/OCUtilTest/OCUtilTest.cpp | 37 +
.../OCUtilTest/OCUtilTest.filters | 33 +
.../OCUtilTest/OCUtilTest.vcxproj | 97 +
.../OCShellExtensions/OCUtilTest/ReadMe.txt | 40 +
.../OCShellExtensions/OCUtilTest/stdafx.cpp | 8 +
.../windows/OCShellExtensions/OCUtilTest/stdafx.h | 15 +
.../OCShellExtensions/OCUtilTest/targetver.h | 8 +
src/CMakeLists.txt | 35 +-
src/creds/credentialsfactory.cpp | 2 +-
src/creds/httpcredentials.cpp | 33 +-
src/creds/httpcredentials.h | 13 +-
src/creds/shibbolethcredentials.cpp | 2 +-
src/mirall/account.cpp | 73 +-
src/mirall/account.h | 10 +
src/mirall/accountmigrator.cpp | 89 +
src/mirall/accountmigrator.h | 38 +
src/mirall/accountsettings.cpp | 39 +-
src/mirall/accountsettings.ui | 2 +-
src/mirall/connectionvalidator.cpp | 11 +
src/mirall/connectionvalidator.h | 1 +
src/mirall/discoveryphase.cpp | 4 +-
src/mirall/discoveryphase.h | 2 +-
src/mirall/filesystem.cpp | 29 +-
src/mirall/filesystem.h | 8 +
src/mirall/folder.cpp | 99 +-
src/mirall/folder.h | 3 +-
src/mirall/folderman.cpp | 133 +-
src/mirall/folderman.h | 14 +-
src/mirall/folderwizard.cpp | 4 +-
src/mirall/mirallconfigfile.cpp | 8 +
src/mirall/networkjobs.cpp | 33 +-
src/mirall/networkjobs.h | 6 +-
src/mirall/owncloudgui.cpp | 28 +-
src/mirall/owncloudpropagator.cpp | 25 +-
src/mirall/owncloudpropagator.h | 5 +
src/mirall/owncloudsetupwizard.cpp | 6 +-
src/mirall/owncloudtheme.cpp | 21 +-
src/mirall/owncloudtheme.h | 2 +
src/mirall/progressdispatcher.cpp | 4 +-
src/mirall/progressdispatcher.h | 2 +
src/mirall/propagator_legacy.cpp | 31 +-
src/mirall/propagator_qnam.cpp | 108 +-
src/mirall/propagator_qnam.h | 4 +-
src/mirall/propagatorjobs.cpp | 10 -
src/mirall/protocolwidget.cpp | 21 +-
src/mirall/protocolwidget.h | 2 +
src/mirall/selectivesyncdialog.cpp | 104 +-
src/mirall/selectivesyncdialog.h | 15 +-
src/mirall/settingsdialog.cpp | 7 +
src/mirall/settingsdialogmac.cpp | 12 +-
src/mirall/socketapi.cpp | 166 +-
src/mirall/socketapi.h | 32 +-
src/mirall/sslbutton.cpp | 6 +-
src/mirall/syncengine.cpp | 93 +-
src/mirall/syncengine.h | 19 +-
src/mirall/syncjournaldb.cpp | 240 +-
src/mirall/syncjournaldb.h | 6 +
src/mirall/syncjournalfilerecord.h | 4 +-
src/mirall/utility.cpp | 3 +-
src/owncloudcmd/netrcparser.cpp | 97 +
src/owncloudcmd/netrcparser.h | 41 +
src/owncloudcmd/owncloudcmd.cpp | 171 +-
src/updater/ocupdater.cpp | 6 +-
src/updater/ocupdater.h | 3 +-
src/updater/sparkleupdater_mac.mm | 6 +-
src/wizard/owncloudadvancedsetuppage.cpp | 45 +
src/wizard/owncloudadvancedsetuppage.h | 4 +
src/wizard/owncloudadvancedsetuppage.ui | 270 +-
src/wizard/owncloudhttpcredspage.cpp | 2 +-
src/wizard/owncloudsetuppage.cpp | 6 +-
src/wizard/owncloudwizard.cpp | 7 +-
src/wizard/owncloudwizard.h | 1 +
src/wizard/owncloudwizardresultpage.cpp | 2 +-
src/wizard/owncloudwizardresultpage.ui | 142 +-
sync-exclude.lst | 2 +
test/CMakeLists.txt | 1 +
test/testnetrcparser.h | 76 +
translations/mirall_ca.ts | 539 +-
translations/mirall_cs.ts | 569 +-
translations/mirall_de.ts | 559 +-
translations/mirall_el.ts | 561 +-
translations/mirall_en.ts | 525 +-
translations/mirall_es.ts | 539 +-
translations/mirall_es_AR.ts | 535 +-
translations/mirall_et.ts | 553 +-
translations/mirall_eu.ts | 535 +-
translations/mirall_fa.ts | 525 +-
translations/mirall_fi.ts | 547 +-
translations/mirall_fr.ts | 569 +-
translations/mirall_gl.ts | 539 +-
translations/mirall_hu.ts | 527 +-
translations/mirall_it.ts | 541 +-
translations/mirall_ja.ts | 553 +-
translations/mirall_nl.ts | 545 +-
translations/mirall_pl.ts | 551 +-
translations/mirall_pt.ts | 549 +-
translations/mirall_pt_BR.ts | 540 +-
translations/mirall_ru.ts | 549 +-
translations/mirall_sk.ts | 537 +-
translations/mirall_sl.ts | 559 +-
translations/mirall_sv.ts | 543 +-
translations/mirall_th.ts | 525 +-
translations/mirall_tr.ts | 555 +-
translations/mirall_uk.ts | 525 +-
translations/mirall_zh_CN.ts | 535 +-
translations/mirall_zh_TW.ts | 533 +-
238 files changed, 30122 insertions(+), 8096 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list