[Pkg-owncloud-commits] [owncloud-client] 79/332: Merge branch 'dark-eye-master'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Aug 14 21:06:41 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 1921d1a5be40887f782a113401b174564f6c487a
Merge: cd82a85 3406fcd
Author: Eran <etherpulse at gmail.com>
Date: Thu Jun 12 12:51:56 2014 +0300
Merge branch 'dark-eye-master'
CMakeLists.txt | 13 +-
ChangeLog | 19 +-
VERSION.cmake | 4 +-
admin/win/nsi/l10n/Greek.nsh | 20 +-
admin/win/nsi/l10n/Hungarian.nsh | 12 +-
admin/win/nsi/l10n/Italian.nsh | 2 +-
admin/win/nsi/l10n/SpanishInternational.nsh | 44 ++
admin/win/nsi/l10n/Turkish.nsh | 2 +-
admin/win/nsi/l10n/languages.nsh | 1 +
cmake/modules/FindNeon.cmake | 2 +-
cmake/modules/FindSQLite3.cmake | 2 +-
cmake/modules/NSIS.template.in | 6 +
cmake/modules/QtVersionAbstraction.cmake | 26 +-
csync/CMakeLists.txt | 14 +-
csync/src/CMakeLists.txt | 18 +-
csync/src/csync.c | 196 ++-----
csync/src/csync.h | 109 +---
csync/src/csync_exclude.c | 22 +-
csync/src/csync_misc.c | 46 --
csync/src/csync_misc.h | 2 -
csync/src/csync_owncloud.c | 562 +++++++-------------
csync/src/csync_owncloud.h | 159 +-----
.../{csync_owncloud.h => csync_owncloud_private.h} | 146 +++---
csync/src/csync_owncloud_recursive_propfind.c | 118 ++---
csync/src/csync_owncloud_util.c | 142 ++++-
csync/src/csync_private.h | 22 +-
csync/src/csync_reconcile.c | 21 +-
csync/src/csync_statedb.c | 28 +-
csync/src/csync_update.c | 40 +-
csync/src/csync_util.c | 66 +--
csync/src/csync_util.h | 4 +-
csync/src/std/CMakeLists.txt | 2 -
csync/src/std/c_dir.c | 189 -------
csync/src/std/c_dir.h | 86 ----
csync/src/std/c_file.c | 346 -------------
csync/src/std/c_file.h | 102 ----
csync/src/std/c_lib.h | 36 --
csync/src/std/c_macro.h | 3 -
csync/src/std/c_path.c | 156 ------
csync/src/std/c_path.h | 22 -
csync/src/std/c_string.c | 63 ---
csync/src/std/c_string.h | 31 --
csync/src/vio/csync_vio.c | 29 +-
csync/src/vio/csync_vio.h | 3 -
csync/src/vio/csync_vio_file_stat.c | 18 +-
csync/src/vio/csync_vio_file_stat.h | 35 +-
csync/src/vio/csync_vio_local.c | 14 +-
csync/tests/CMakeLists.txt | 2 -
csync/tests/csync_tests/check_csync_commit.c | 6 -
csync/tests/csync_tests/check_csync_create.c | 3 -
csync/tests/csync_tests/check_csync_exclude.c | 8 -
csync/tests/csync_tests/check_csync_init.c | 6 -
csync/tests/csync_tests/check_csync_log.c | 3 -
csync/tests/csync_tests/check_csync_statedb_load.c | 2 -
.../tests/csync_tests/check_csync_statedb_query.c | 19 -
csync/tests/csync_tests/check_csync_update.c | 15 -
csync/tests/ownCloud/t1.pl | 38 +-
csync/tests/ownCloud/t3.pl | 10 +
csync/tests/std_tests/check_std_c_dir.c | 176 -------
csync/tests/std_tests/check_std_c_file.c | 180 -------
csync/tests/std_tests/check_std_c_path.c | 27 -
csync/tests/std_tests/check_std_c_str.c | 86 ----
doc/CMakeLists.txt | 15 +-
doc/troubleshooting.rst | 22 +
src/3rdparty/qtlockedfile/README.txt | 2 +-
src/3rdparty/qtlockedfile/qtlockedfile.cpp | 41 +-
src/3rdparty/qtlockedfile/qtlockedfile.h | 41 +-
src/3rdparty/qtlockedfile/qtlockedfile.pri | 11 +
src/3rdparty/qtlockedfile/qtlockedfile_unix.cpp | 42 +-
src/3rdparty/qtlockedfile/qtlockedfile_win.cpp | 44 +-
src/3rdparty/qtsingleapplication/README.txt | 2 +-
src/3rdparty/qtsingleapplication/qtlocalpeer.cpp | 82 +--
src/3rdparty/qtsingleapplication/qtlocalpeer.h | 53 +-
.../qtsingleapplication/qtsingleapplication.cpp | 202 ++++----
.../qtsingleapplication/qtsingleapplication.h | 80 ++-
.../qtsingleapplication/qtsingleapplication.pri | 15 +
.../qtsinglecoreapplication.cpp | 49 +-
.../qtsingleapplication/qtsinglecoreapplication.h | 45 +-
.../qtsinglecoreapplication.pri | 14 +
src/CMakeLists.txt | 83 +--
src/creds/abstractcredentials.h | 4 +-
src/creds/credentialsfactory.cpp | 1 +
src/creds/credentialsfactory.h | 6 +-
src/creds/httpcredentials.cpp | 6 +-
src/creds/httpcredentials.h | 2 +-
src/creds/shibboleth/shibbolethaccessmanager.cpp | 55 --
src/creds/shibboleth/shibbolethaccessmanager.h | 43 --
src/creds/shibboleth/shibbolethconfigfile.cpp | 104 ----
src/creds/shibboleth/shibbolethconfigfile.h | 38 --
src/creds/shibboleth/shibbolethcookiejar.cpp | 34 --
src/creds/shibboleth/shibbolethcookiejar.h | 41 --
src/creds/shibboleth/shibbolethuserjob.cpp | 2 +-
src/creds/shibboleth/shibbolethwebview.cpp | 91 ++--
src/creds/shibboleth/shibbolethwebview.h | 15 +-
src/creds/shibbolethcredentials.cpp | 180 ++++---
src/creds/shibbolethcredentials.h | 23 +-
src/creds/tokencredentials.cpp | 28 +-
src/creds/tokencredentials.h | 2 +-
src/main.cpp | 22 +
src/mirall/account.cpp | 18 +-
src/mirall/account.h | 8 +-
src/mirall/accountsettings.cpp | 28 +-
src/mirall/application.cpp | 25 +-
src/mirall/application.h | 6 +-
src/mirall/clientproxy.h | 3 +-
src/mirall/connectionvalidator.h | 3 +-
src/mirall/cookiejar.cpp | 155 ++++++
src/mirall/cookiejar.h | 47 ++
src/mirall/folder.cpp | 151 ++++--
src/mirall/folder.h | 23 +-
src/mirall/folderman.cpp | 36 +-
src/mirall/folderman.h | 11 +-
src/mirall/folderwatcher.cpp | 4 +-
src/mirall/folderwizard.cpp | 2 +-
src/mirall/logger.cpp | 33 +-
src/mirall/logger.h | 12 +-
src/mirall/mirallaccessmanager.cpp | 5 +-
src/mirall/mirallaccessmanager.h | 3 +-
src/mirall/mirallconfigfile.cpp | 20 +-
src/mirall/mirallconfigfile.h | 5 +-
src/mirall/networkjobs.cpp | 1 -
src/mirall/networkjobs.h | 18 +-
src/mirall/owncloudpropagator.cpp | 112 +++-
src/mirall/owncloudpropagator.h | 21 +-
src/mirall/owncloudsetupwizard.cpp | 10 +-
src/mirall/owncloudtheme.cpp | 9 +-
src/mirall/progressdispatcher.cpp | 4 +-
src/mirall/progressdispatcher.h | 35 +-
src/mirall/propagator_legacy.cpp | 23 +-
src/mirall/propagator_qnam.cpp | 200 ++++++--
src/mirall/propagator_qnam.h | 28 +-
src/mirall/propagatorjobs.cpp | 63 ++-
src/mirall/propagatorjobs.h | 10 +
src/mirall/settingsdialogmac.cpp | 4 -
src/mirall/socketapi.cpp | 184 ++++---
src/mirall/socketapi.h | 10 +-
src/mirall/sslbutton.cpp | 2 +-
src/mirall/syncengine.cpp | 66 ++-
src/mirall/syncengine.h | 9 +-
src/mirall/syncfileitem.h | 5 +-
src/mirall/syncjournaldb.cpp | 74 ++-
src/mirall/syncjournaldb.h | 17 +-
src/mirall/syncjournalfilerecord.cpp | 16 +-
src/mirall/syncresult.h | 3 +-
src/mirall/theme.cpp | 9 +-
src/mirall/theme.h | 6 +-
src/mirall/utility.cpp | 42 +-
src/mirall/utility.h | 53 +-
src/mirall/utility_unix.cpp | 2 +-
src/owncloudcmd/owncloudcmd.cpp | 16 +-
src/owncloudcmd/owncloudcmd.h | 31 ++
src/wizard/owncloudshibbolethcredspage.cpp | 78 +--
src/wizard/owncloudshibbolethcredspage.h | 11 +-
sync-exclude.lst | 1 +
test/testfolderwatcher.h | 5 +-
translations/mirall_ca.ts | 426 ++++++++-------
translations/mirall_cs.ts | 406 ++++++++-------
translations/mirall_de.ts | 404 ++++++++-------
translations/mirall_el.ts | 414 ++++++++-------
translations/mirall_en.ts | 396 +++++++-------
translations/mirall_es.ts | 420 ++++++++-------
translations/mirall_es_AR.ts | 398 +++++++-------
translations/mirall_et.ts | 418 ++++++++-------
translations/mirall_eu.ts | 422 ++++++++-------
translations/mirall_fa.ts | 396 +++++++-------
translations/mirall_fi.ts | 418 ++++++++-------
translations/mirall_fr.ts | 398 +++++++-------
translations/mirall_gl.ts | 402 ++++++++-------
translations/mirall_hu.ts | 396 +++++++-------
translations/mirall_it.ts | 400 ++++++++-------
translations/mirall_ja.ts | 457 +++++++++--------
translations/mirall_nl.ts | 396 +++++++-------
translations/mirall_pl.ts | 398 +++++++-------
translations/mirall_pt.ts | 443 ++++++++--------
translations/mirall_pt_BR.ts | 426 ++++++++-------
translations/mirall_ru.ts | 414 ++++++++-------
translations/mirall_sk.ts | 551 +++++++++++---------
translations/mirall_sl.ts | 404 ++++++++-------
translations/mirall_sv.ts | 412 ++++++++-------
translations/mirall_th.ts | 396 +++++++-------
translations/mirall_tr.ts | 523 ++++++++++---------
translations/mirall_uk.ts | 396 +++++++-------
translations/mirall_zh_CN.ts | 570 +++++++++++----------
translations/mirall_zh_TW.ts | 396 +++++++-------
184 files changed, 9423 insertions(+), 9773 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