[Pkg-owncloud-commits] [owncloud-client] 235/332: Merge https://github.com/owncloud/mirall into fix_folder_status_ui_ignore_new_line_inoverall_text
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Aug 14 21:07:05 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 8e5c41e6f37bd1848e807dded2817a3fa46dc1cc
Merge: 0f7efbc 6b7bd07
Author: Eran <etherpulse at gmail.com>
Date: Wed Jul 23 13:53:05 2014 +0300
Merge https://github.com/owncloud/mirall into fix_folder_status_ui_ignore_new_line_inoverall_text
CMakeLists.txt | 1 +
ChangeLog | 30 +
admin/win/nsi/l10n/Catalan.nsh | 68 +-
admin/win/nsi/l10n/SimpChinese.nsh | 32 +-
cmake/modules/DefineCompilerFlags.cmake | 2 +-
cmake/modules/NSIS.template.in | 15 +-
cmake/modules/QtVersionAbstraction.cmake | 2 +
cmake/modules/Warnings.cmake | 2 +
csync/src/csync.c | 5 -
csync/src/csync_exclude.c | 4 +
csync/src/csync_owncloud.c | 2 +-
csync/src/csync_owncloud_private.h | 2 +-
csync/src/csync_owncloud_recursive_propfind.c | 7 +-
csync/src/csync_owncloud_util.c | 10 +-
csync/src/csync_reconcile.c | 6 +-
csync/src/csync_statedb.c | 6 +-
csync/src/csync_update.c | 35 +-
csync/src/csync_util.c | 12 +-
csync/src/httpbf/src/httpbf.c | 4 +-
csync/src/std/c_time.c | 3 +-
csync/src/vio/csync_vio_local.c | 1 +
csync/tests/csync_tests/check_csync_create.c | 1 -
csync/tests/ownCloud/ownCloud/Test.pm | 6 +-
csync/tests/ownCloud/t1.pl | 4 +-
csync/tests/ownCloud/t2.pl | 25 +-
csync/tests/ownCloud/t5.pl | 1 -
csync/tests/ownCloud/t6.pl | 50 +-
csync/tests/ownCloud/t7.pl | 235 ++++++
csync/tests/ownCloud/t8.pl | 110 +++
doc/accountsetup.rst | 41 +-
doc/architecture.rst | 263 +++----
doc/autoupdate.rst | 139 ++--
doc/building.rst | 160 +++--
doc/conffile.rst | 24 +-
doc/faq.rst | 17 +-
doc/images/client_setup_wizard_components.png | Bin 0 -> 35196 bytes
doc/images/client_setup_wizard_install_finish.png | Bin 0 -> 21141 bytes
.../client_setup_wizard_install_progress.png | Bin 0 -> 19726 bytes
doc/images/client_setup_wizard_location.png | Bin 0 -> 30498 bytes
doc/images/client_setup_wizard_main.png | Bin 0 -> 25868 bytes
doc/images/client_setup_wizard_reinstall.png | Bin 0 -> 33624 bytes
doc/images/client_setup_wizard_uninstall.png | Bin 0 -> 33621 bytes
doc/images/client_setup_wizard_uninstall_2.png | Bin 0 -> 29159 bytes
doc/images/client_setup_wizard_uninstall_3.png | Bin 0 -> 31134 bytes
doc/images/download_button.png | Bin 0 -> 1163 bytes
doc/images/log_output_window.png | Bin 0 -> 43946 bytes
doc/images/oc_client_download_options.png | Bin 0 -> 7171 bytes
doc/images/oc_client_linux_download.png | Bin 0 -> 35366 bytes
doc/images/oc_client_macosx_download.png | Bin 0 -> 33779 bytes
doc/images/oc_client_windows_download.png | Bin 0 -> 24779 bytes
doc/images/oc_client_windows_option.png | Bin 0 -> 1689 bytes
doc/images/oc_connection_wizard_credentials.png | Bin 0 -> 33007 bytes
doc/images/oc_connection_wizard_finish.png | Bin 0 -> 40657 bytes
doc/images/oc_connection_wizard_localfolder.png | Bin 0 -> 37287 bytes
doc/images/oc_connection_wizard_server.png | Bin 0 -> 32433 bytes
doc/images/oc_website.png | Bin 0 -> 72353 bytes
doc/images/owncloud_logo_transparent.png | Bin 0 -> 47374 bytes
doc/images/owncloud_small_wh_bl.jpg | Bin 0 -> 11741 bytes
doc/images/save_log_file.png | Bin 0 -> 68034 bytes
doc/images/security_warning_windows.png | Bin 0 -> 13093 bytes
doc/index.rst | 5 +-
doc/installing-linux.rst | 208 ++++++
doc/installing-macosx.rst | 4 +
doc/installing-windows.rst | 102 +++
doc/installing.rst | 13 +
doc/introduction.rst | 34 +-
doc/logo-blue.pdf | Bin 1851 -> 1849 bytes
doc/navigating.rst | 313 ++++++++
doc/ocdoc | 2 +-
doc/options.rst | 15 +-
doc/owncloud.1.rst | 8 +-
doc/owncloudcmd.1.rst | 28 +-
doc/owncloudcmd.rst | 57 +-
doc/troubleshooting.rst | 269 ++++---
shell_integration/CMakeLists.txt | 1 +
.../UserInterfaceState.xcuserstate | Bin 0 -> 33056 bytes
shell_integration/testclient/CMakeLists.txt | 11 +
shell_integration/testclient/main.cpp | 27 +
shell_integration/testclient/socketclient.cpp | 22 +
shell_integration/testclient/socketclient.h | 21 +
shell_integration/testclient/window.cpp | 101 +++
shell_integration/testclient/window.h | 32 +
shell_integration/testclient/window.ui | 31 +
.../QProgressIndicator/QProgressIndicator.h | 8 +-
src/3rdparty/fancylineedit/fancylineedit.cpp | 4 +-
src/3rdparty/fancylineedit/fancylineedit.h | 4 +-
.../qtsingleapplication/qtsingleapplication.h | 2 +-
src/CMakeLists.txt | 87 +--
src/creds/dummycredentials.h | 22 +-
src/creds/httpcredentials.cpp | 57 +-
src/creds/httpcredentials.h | 23 +-
src/creds/shibboleth/shibbolethuserjob.h | 8 +-
src/creds/shibboleth/shibbolethwebview.cpp | 33 +-
src/creds/shibboleth/shibbolethwebview.h | 4 +-
src/creds/shibbolethcredentials.cpp | 45 ++
src/creds/shibbolethcredentials.h | 30 +-
src/creds/tokencredentials.cpp | 37 +-
src/creds/tokencredentials.h | 3 +-
src/mirall/accountsettings.cpp | 30 +-
src/mirall/accountsettings.h | 1 -
src/mirall/application.cpp | 5 +-
src/mirall/application.h | 2 -
src/mirall/connectionvalidator.cpp | 1 -
src/mirall/cookiejar.h | 12 +-
src/mirall/filesystem.h | 4 +-
src/mirall/folder.cpp | 42 +-
src/mirall/folder.h | 19 +-
src/mirall/folderman.cpp | 53 +-
src/mirall/folderman.h | 12 +-
src/mirall/folderstatusmodel.h | 13 +-
src/mirall/folderwatcher.cpp | 1 -
src/mirall/folderwizard.cpp | 3 +-
src/mirall/folderwizard.h | 14 +-
src/mirall/generalsettings.ui | 2 +-
src/mirall/logbrowser.h | 2 +-
src/mirall/mirallaccessmanager.h | 2 +-
src/mirall/mirallconfigfile.cpp | 7 +-
src/mirall/networkjobs.cpp | 31 +-
src/mirall/networkjobs.h | 32 +-
src/mirall/openfilemanager.cpp | 185 +++++
.../openfilemanager.h} | 20 +-
src/mirall/owncloudgui.cpp | 22 +-
src/mirall/owncloudgui.h | 2 +
src/mirall/owncloudpropagator.cpp | 42 +-
src/mirall/owncloudpropagator.h | 17 +-
src/mirall/owncloudsetupwizard.cpp | 20 +-
src/mirall/owncloudsetupwizard.h | 9 +-
src/mirall/owncloudtheme.cpp | 3 +-
src/mirall/owncloudtheme.h | 20 +-
src/mirall/progressdispatcher.cpp | 2 +-
src/mirall/propagator_legacy.cpp | 54 +-
src/mirall/propagator_legacy.h | 13 +-
src/mirall/propagator_qnam.cpp | 90 ++-
src/mirall/propagator_qnam.h | 33 +-
src/mirall/propagatorjobs.cpp | 42 +-
src/mirall/propagatorjobs.h | 17 +-
src/mirall/protocolwidget.cpp | 10 +-
src/mirall/settingsdialog.h | 4 +-
src/mirall/settingsdialogmac.cpp | 12 +
src/mirall/socketapi.cpp | 248 +++----
src/mirall/socketapi.h | 23 +-
src/mirall/sslerrordialog.h | 2 +-
src/mirall/syncengine.cpp | 281 +++++++-
src/mirall/syncengine.h | 21 +-
src/mirall/syncfileitem.h | 11 +-
src/mirall/syncfilestatus.cpp | 87 +++
src/mirall/syncfilestatus.h | 58 ++
src/mirall/syncjournaldb.cpp | 6 +-
src/mirall/syncjournaldb.h | 4 +-
src/mirall/syncjournalfilerecord.h | 4 +-
src/mirall/syncrunfilelog.cpp | 1 -
src/mirall/theme.cpp | 9 +
src/mirall/theme.h | 2 +-
src/mirall/utility.cpp | 193 +----
src/mirall/utility.h | 9 +-
src/owncloudcmd/owncloudcmd.cpp | 14 +-
src/owncloudcmd/simplesslerrorhandler.h | 2 +-
src/updater/ocupdater.cpp | 4 +-
src/updater/ocupdater.h | 12 +-
src/updater/sparkleupdater.h | 6 +-
src/wizard/abstractcredswizardpage.h | 2 +-
src/wizard/owncloudadvancedsetuppage.h | 8 +-
src/wizard/owncloudhttpcredspage.h | 10 +-
src/wizard/owncloudsetuppage.cpp | 2 -
src/wizard/owncloudsetuppage.h | 11 +-
src/wizard/owncloudshibbolethcredspage.cpp | 10 +-
src/wizard/owncloudshibbolethcredspage.h | 11 +-
src/wizard/owncloudwizard.cpp | 1 +
src/wizard/owncloudwizardresultpage.h | 4 +-
test/CMakeLists.txt | 26 +-
test/owncloud_add_test.cmake | 9 +-
translations/mirall_ca.ts | 474 ++++++------
translations/mirall_cs.ts | 478 +++++++------
translations/mirall_de.ts | 474 ++++++------
translations/mirall_el.ts | 795 +++++++++++----------
translations/mirall_en.ts | 467 ++++++------
translations/mirall_es.ts | 476 ++++++------
translations/mirall_es_AR.ts | 474 ++++++------
translations/mirall_et.ts | 468 ++++++------
translations/mirall_eu.ts | 475 ++++++------
translations/mirall_fa.ts | 471 ++++++------
translations/mirall_fi.ts | 489 +++++++------
translations/mirall_fr.ts | 487 +++++++------
translations/mirall_gl.ts | 470 ++++++------
translations/mirall_hu.ts | 471 ++++++------
translations/mirall_it.ts | 483 +++++++------
translations/mirall_ja.ts | 481 +++++++------
translations/mirall_nl.ts | 487 +++++++------
translations/mirall_pl.ts | 483 +++++++------
translations/mirall_pt.ts | 533 +++++++-------
translations/mirall_pt_BR.ts | 534 +++++++-------
translations/mirall_ru.ts | 583 ++++++++-------
translations/mirall_sk.ts | 476 ++++++------
translations/mirall_sl.ts | 504 +++++++------
translations/mirall_sv.ts | 487 +++++++------
translations/mirall_th.ts | 469 ++++++------
translations/mirall_tr.ts | 470 ++++++------
translations/mirall_uk.ts | 571 ++++++++-------
translations/mirall_zh_CN.ts | 552 +++++++-------
translations/mirall_zh_TW.ts | 663 +++++++++--------
200 files changed, 11632 insertions(+), 8105 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