[Pkg-owncloud-commits] [owncloud-client] 12/498: Merge remote-tracking branch 'origin/1.8'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue Aug 11 14:48:28 UTC 2015
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 457f9b587d684f063084df3a0346d04a997391a4
Merge: 40cdbda 09749e2
Author: Daniel Molkentin <danimo at owncloud.com>
Date: Fri Mar 13 14:03:03 2015 +0100
Merge remote-tracking branch 'origin/1.8'
Conflicts:
src/gui/sharedialog.cpp
src/gui/sharedialog.h
ChangeLog | 7 +-
OWNCLOUD.cmake | 2 +-
VERSION.cmake | 2 +-
admin/osx/gen_sym_files.py | 75 +
admin/win/nsi/l10n/Galician.nsh | 4 +-
admin/win/nsi/nsis_processes/bin/Processes.dll | Bin 36352 -> 0 bytes
admin/win/nsi/nsis_processes/license.rtf | 35 -
admin/win/nsi/nsis_processes/readme.txt | 122 --
admin/win/nsi/nsis_processes/src/StdAfx.cpp | 8 -
admin/win/nsi/nsis_processes/src/StdAfx.h | 34 -
admin/win/nsi/nsis_processes/src/exdll.c | 37 -
admin/win/nsi/nsis_processes/src/exdll.h | 136 --
admin/win/nsi/nsis_processes/src/processes.cpp | 411 ------
admin/win/nsi/nsis_processes/src/processes.h | 49 -
admin/win/nsi/nsis_processes/src/processes.ncb | Bin 44032 -> 0 bytes
admin/win/nsi/nsis_processes/src/processes.rc | 103 --
admin/win/nsi/nsis_processes/src/processes.sln | 21 -
admin/win/nsi/nsis_processes/src/processes.txt | 122 --
admin/win/nsi/nsis_processes/src/processes.vcproj | 222 ---
admin/win/nsi/nsis_processes/src/resource.h | 15 -
admin/win/nsi/nsis_uac/History.txt | 102 --
admin/win/nsi/nsis_uac/License.txt | 14 -
admin/win/nsi/nsis_uac/NSISUtil.h | 149 --
admin/win/nsi/nsis_uac/Release/A/UAC.dll | Bin 17408 -> 0 bytes
admin/win/nsi/nsis_uac/Release/U/UAC.dll | Bin 18432 -> 0 bytes
admin/win/nsi/nsis_uac/RunAs.cpp | 277 ----
admin/win/nsi/nsis_uac/UAC Readme.html | 222 ---
admin/win/nsi/nsis_uac/UAC.nsh | 191 ---
admin/win/nsi/nsis_uac/UAC_AdminOnly.nsi | 62 -
admin/win/nsi/nsis_uac/UAC_AllowLUA.nsi | 45 -
.../nsi/nsis_uac/UAC_GetUserShellFolderPath.nsi | 30 -
.../UAC_RealWorldFullyLoadedDualModeExample.nsi | 235 ---
admin/win/nsi/nsis_uac/UAC_Uninstaller.nsi | 49 -
admin/win/nsi/nsis_uac/resource.h | 24 -
admin/win/nsi/nsis_uac/resource.rc | 109 --
admin/win/nsi/nsis_uac/uac.cpp | 1518 --------------------
admin/win/nsi/nsis_uac/uac.h | 169 ---
cmake/modules/NSIS.template.in | 1 -
csync/src/csync.c | 9 -
csync/src/csync.h | 4 +-
csync/src/csync_exclude.c | 19 +-
csync/src/csync_exclude.h | 3 +-
csync/src/csync_macros.h | 1 +
csync/src/csync_misc.c | 3 +
csync/src/csync_update.c | 8 +-
doc/architecture.rst | 72 +-
doc/building.rst | 49 +-
.../MacOSX/OwnCloudFinder/ContentManager.m | 8 +-
.../MacOSX/OwnCloudFinder/FinderHook.m | 12 +-
.../MacOSX/OwnCloudFinder/RequestManager.m | 4 +-
.../MacOSX/OwnCloudInjector/OwnCloudInjector.m | 14 +-
shell_integration/nautilus/syncstate.py | 8 +-
.../windows/OCContextMenu/OCContextMenu.cpp | 2 +-
.../windows/OCUtil/CommunicationSocket.cpp | 2 +
shell_integration/windows/OCUtil/OCUtil.vcxproj | 5 +
src/3rdparty/libcrashreporter-qt | 2 +-
src/crashreporter/CMakeLists.txt | 12 +
src/gui/accountsettings.cpp | 14 +-
src/gui/accountstate.cpp | 10 +
src/gui/accountstate.h | 5 +
src/gui/addcertificatedialog.cpp | 14 +
src/gui/addcertificatedialog.h | 14 +
src/gui/application.cpp | 16 +-
src/gui/application.h | 7 +
src/gui/folder.cpp | 7 +-
src/gui/folderman.cpp | 99 +-
src/gui/folderman.h | 9 +-
src/gui/folderwizard.cpp | 11 +-
src/gui/main.cpp | 14 -
src/gui/owncloudgui.cpp | 6 +-
src/gui/owncloudgui.h | 2 +-
src/gui/owncloudsetupwizard.cpp | 28 +-
src/gui/owncloudsetupwizard.h | 11 -
src/gui/protocolwidget.cpp | 39 +-
src/gui/selectivesyncdialog.cpp | 1 +
src/gui/settingsdialog.cpp | 3 +
src/gui/settingsdialogmac.cpp | 7 +
src/gui/sharedialog.cpp | 206 ++-
src/gui/sharedialog.h | 15 +-
src/gui/sharedialog.ui | 220 +--
src/gui/socketapi.cpp | 47 +-
src/gui/socketapi.h | 3 +-
src/gui/syncrunfilelog.cpp | 2 +-
src/gui/wizard/owncloudconnectionmethoddialog.cpp | 14 +
src/gui/wizard/owncloudconnectionmethoddialog.h | 14 +
src/gui/wizard/owncloudwizard.h | 2 +-
src/libsync/CMakeLists.txt | 5 +-
src/libsync/connectionvalidator.cpp | 24 +-
src/libsync/connectionvalidator.h | 1 +
src/libsync/creds/tokencredentials.cpp | 9 +-
src/libsync/discoveryphase.cpp | 80 +-
src/libsync/discoveryphase.h | 17 +-
src/libsync/filesystem.cpp | 150 +-
src/libsync/filesystem.h | 29 +-
src/libsync/networkjobs.cpp | 64 +-
src/libsync/networkjobs.h | 36 +-
src/libsync/progressdispatcher.cpp | 3 +-
src/libsync/propagatedownload.cpp | 21 +-
src/libsync/propagatedownload.h | 4 +-
src/libsync/propagateremotedelete.cpp | 8 +-
src/libsync/propagateremotemkdir.cpp | 6 +-
src/libsync/propagateremotemove.cpp | 12 +-
src/libsync/propagateupload.cpp | 104 +-
src/libsync/propagateupload.h | 23 +-
src/libsync/propagator_legacy.cpp | 6 +-
src/libsync/propagatorjobs.cpp | 9 +-
src/libsync/syncengine.cpp | 33 +-
src/libsync/syncengine.h | 1 +
src/libsync/syncfileitem.h | 59 +-
src/libsync/theme.cpp | 2 +-
test/testconcaturl.h | 2 +-
translations/client_cs.ts | 44 +-
translations/client_el.ts | 48 +-
translations/client_fr.ts | 8 +-
translations/client_ja.ts | 4 +-
translations/client_sl.ts | 14 +-
translations/client_sv.ts | 28 +-
translations/client_uk.ts | 2 +-
translations/client_zh_TW.ts | 268 ++--
translations/mirall_en.ts | 589 ++++----
120 files changed, 1825 insertions(+), 5567 deletions(-)
diff --cc src/gui/sharedialog.cpp
index 78e3aaf,f2d63a4..8260dd0
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@@ -1,5 -1,6 +1,6 @@@
-/*
- * Copyright (C) 2015 by Roeland Douma
+/*
+ * Copyright (C) by Roeland Jago Douma <roeland at famdouma.nl>
+ * Copyright (C) 2015 by Klaas Freitag <freitag at owncloud.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --cc src/gui/sharedialog.h
index 74c1c6c,50710de..7c090e9
--- a/src/gui/sharedialog.h
+++ b/src/gui/sharedialog.h
@@@ -1,5 -1,6 +1,6 @@@
/*
- * Copyright (C) 2015 by Roeland Douma
+ * Copyright (C) by Roeland Jago Douma <roeland at famdouma.nl>
+ * Copyright (C) 2015 by Klaas Freitag <freitag at owncloud.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
--
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