[Pkg-owncloud-commits] [owncloud-client] branch upstream updated (1229b25 -> 02e0a41)
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Apr 30 18:09:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a change to branch upstream
in repository owncloud-client.
from 1229b25 Imported Upstream version 1.6.0~beta1+dfsg
new 3af53f5 [tx-robot] updated from transifex
new f302da8 [tx-robot] updated from transifex
new 87010fb SSL Button: Fix issues around printing Hash sums
new d3d202d Fix dataLocation on Linux/BSD
new 09e0539 Ignore all sync log files in the sync dir.
new d66b091 [tx-robot] updated from transifex
new b0734f2 [tx-robot] updated from transifex
new 30a14b9 Install ocsync library to private lib directory, use rpath to find it.
new 8250fb8 Fix typo.
new 5f37c7b [tx-robot] updated from transifex
new 598bfe6 [tx-robot] updated from transifex
new 9f4ffd4 [tx-robot] updated from transifex
new ef9a318 AbstractNetworkJob Allow finished() to defer Job deletion
new dc043b5 Try scheme://host/owncloud if scheme://host/ did not work
new efc4ff4 Fix redirects in CheckServerJob
new d836b80 Fix reconnect after server disconnect
new 9dcbafc [tx-robot] updated from transifex
new c920f81 Add braces.
new 0a27912 Add a reset method.
new 4c6e6f6 Add initialisations for member variables.
new 82ab5fd Fix condition if network limit change is logged or not.
new aee7515 Do not dereference the _engine member variable without check.
new d143044 Add missing cases to avoid "unknown action" under some circumstances.
new a7a19fa Fix note template label
new edc7a95 [tx-robot] updated from transifex
new a907799 [tx-robot] updated from transifex
new e6664c7 [tx-robot] updated from transifex
new bfdf638 Add the files required by the tests.
new fa38bf7 Make sure the fileid are saved to the database when upgrading from owncloud5 to owncloud6
new 7d3b0fe Fix memory leak: Don't need to call strdup here
new 4731b50 [tx-robot] updated from transifex
new b08284e Fix the background check job for the connection
new ed48b4b [tx-robot] updated from transifex
new 9b71643 Space fix
new ece4192 Merge pull request #1697 from wakeup/master
new 934eda1 [tx-robot] updated from transifex
new 655188d [tx-robot] updated from transifex
new c24732f More debugable code.
new 521373f More specific log output.
new 78e5e4a Fix non-closed p tag
new 0cf8091 Merge pull request #1700 from wakeup/master
new 44a0422 Update dynamically the error message in the account settings
new ee22f37 Start the folder watcher when new folder are added
new 46d6191 Also list folder for which the alias starts with '.'
new 62dcfe8 [tx-robot] updated from transifex
new 1af7dc9 Update to latest GNUInstallDirs cmake module
new 2897039 Removed a test file as jenkins fails on it.
new 888843e Removed another file for Jenkins.
new f72e1cc Log: Don't override level for csync
new 4e0496f respect XDG_CONFIG_HOME for getting user config dir.
new 47274f1 Merge remote-tracking branch 'respect-XDG_CONFIG_HOME' into 1.5
new 08dd979 HACK to avoid continuation: See task #1448
new 1d862b7 merged 1.5 into master
new 9b7a3d0 Using QFile::decodeName instead of QLatin1String
new a154656 [tx-robot] updated from transifex
new cc7826e Add a compile option to disable renaming when the extension changes
new a29a56b [tx-robot] updated from transifex
new 7544f4d [tx-robot] updated from transifex
new 9da261a Do not read from the database when upgrading from 1.5
new 165e35c t1.pl: change assertLocalAndRemoteDir so we actually test something
new 1d3febe [tx-robot] updated from transifex
new 2a1e67e [tx-robot] updated from transifex
new ab711dd [tx-robot] updated from transifex
new 3ab1330 [tx-robot] updated from transifex
new b8b0648 [tx-robot] updated from transifex
new 2d3ea59 Limit the mac workaround to the Mac OS X platform
new 1c73a8d Fix installation for MacOSX
new b42d3ce Another fix for make install on MacOSX
new 7e70277 Add missing line break
new f159b02 Add a compile option to not blacklist error code 5xx
new 77ac092 WiP: Attempt to compile without UI
new 1338c08 Fix compilation on linux with BUILD_LIBRARIES_ONLY
new 3fac5f9 In case of error, report the right error instead of missing etag
new edb1f61 Fix compilation without the BUILD_ONLY_LIBRARIES mode
new 707c6fc An abort on the reply is not usually a password error.
new 4be20db Propagator: Add makeConflictFileName function
new 197d180 Propagator: Add support for CSYNC_CONFLICT_FILE_USERNAME
new 94f380c Updater: Ignore files matching with CSYNC_CONFLICT_FILE_USERNAME
new f2519e9 Fix function signature: pass argument by const reference
new f6711b2 CMake: Find libraries also on Win host compile
new 5c92c19 Add EXPORT macro to owncloudsync library
new 642c16b Missing EXPORT
new b39359c Csync: Add hook for checking if a file is in use already
new 7f752c7 Csync: Plug code for csync_file_locked_or_open
new 4489a56 Csync: Set error at correct place
new 9f0848b Merge remote-tracking branch 'origin/libowncloudsync_noqtgui'
new 0bffdfb Fix compiler warnings, and be less spammy in the log
new 7c27638 Set release suffix to beta2
new 6471a45 Added changelog beta1 -> beta2
new a268b03 Try to not have windows stay-on-top
new 3ee729b Add export macro to all classes that need to be exported
new 64b4233 Fix typo.
new dcc5c10 fix forward declaration of CredentialsFactory::create
new 1b8d111 Add missing include
new 9193286 Support old server which do not have the x-oc-mtime support
new 983f9c5 The job restore job need to be run with QMetaObject::invoke
new 876de8f Networkjobs: Remove stray include
new 3bf1554 Add set_csync_file_locked_or_open_ext
new 47c23da [tx-robot] updated from transifex
new d62deab Fix updating mtime
new 02e0a41 Imported Upstream version 1.6.0~beta2+dfsg
The 101 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.tag | 2 +-
CMakeLists.txt | 8 +
ChangeLog | 12 +
VERSION.cmake | 2 +-
cmake/modules/FindNeon.cmake | 2 +-
cmake/modules/FindSQLite3.cmake | 2 +-
cmake/modules/GNUInstallDirs.cmake | 157 ++++--
cmake/modules/QtVersionAbstraction.cmake | 26 +-
csync/src/CMakeLists.txt | 33 +-
csync/src/csync.c | 13 +-
csync/src/csync.h | 13 +-
csync/src/csync_exclude.c | 14 +
csync/src/csync_private.h | 1 +
csync/src/csync_reconcile.c | 13 +-
csync/src/csync_update.c | 41 +-
csync/src/csync_util.c | 20 +-
csync/src/csync_util.h | 1 +
csync/tests/csync_tests/check_csync_update.c | 7 -
csync/tests/ownCloud/t1.pl | 45 +-
csync/tests/ownCloud/t2.pl | 19 +-
csync/tests/ownCloud/toremote1/My Document.doc | 1 +
csync/tests/ownCloud/toremote1/kernelcrash.txt | 16 +
csync/tests/ownCloud/toremote1/kraft_logo.gif | Bin 0 -> 7080 bytes
csync/tests/ownCloud/toremote1/rtl2/mettre.xls | 1 -
doc/visualtour.rst | 2 +-
src/CMakeLists.txt | 87 +--
src/creds/abstractcredentials.h | 4 +-
src/creds/credentialsfactory.cpp | 1 +
src/creds/credentialsfactory.h | 6 +-
src/creds/httpcredentials.h | 2 +-
src/creds/shibboleth/shibbolethuserjob.cpp | 5 +-
src/creds/shibboleth/shibbolethuserjob.h | 2 +-
src/creds/shibboleth/shibbolethwebview.h | 3 +-
src/creds/shibbolethcredentials.h | 2 +-
src/creds/tokencredentials.cpp | 19 +-
src/creds/tokencredentials.h | 2 +-
src/mirall/account.h | 5 +-
src/mirall/accountsettings.cpp | 5 +
src/mirall/application.cpp | 11 +-
src/mirall/application.h | 3 +
src/mirall/clientproxy.h | 3 +-
src/mirall/connectionvalidator.h | 3 +-
src/mirall/folder.cpp | 9 +-
src/mirall/folder.h | 6 +-
src/mirall/folderman.cpp | 14 +-
src/mirall/folderman.h | 2 +-
src/mirall/folderwatcher_linux.cpp | 2 +-
src/mirall/logger.h | 4 +-
src/mirall/mirallaccessmanager.cpp | 2 +-
src/mirall/mirallaccessmanager.h | 3 +-
src/mirall/mirallconfigfile.cpp | 13 +-
src/mirall/mirallconfigfile.h | 3 +-
src/mirall/networkjobs.cpp | 49 +-
src/mirall/networkjobs.h | 30 +-
src/mirall/owncloudgui.cpp | 8 +
.../favlink/main.cpp => src/mirall/owncloudlib.h | 16 +-
src/mirall/owncloudpropagator.cpp | 7 +-
src/mirall/owncloudsetupwizard.cpp | 13 +-
src/mirall/owncloudsetupwizard.h | 4 +-
src/mirall/owncloudtheme.cpp | 11 +-
src/mirall/progressdispatcher.cpp | 52 +-
src/mirall/progressdispatcher.h | 9 +-
src/mirall/propagator_legacy.cpp | 12 +-
src/mirall/propagator_qnam.cpp | 73 ++-
src/mirall/propagator_qnam.h | 14 +-
src/mirall/propagatorjobs.cpp | 11 +-
src/mirall/propagatorjobs.h | 9 +
src/mirall/quotainfo.cpp | 2 -
src/mirall/sslbutton.cpp | 33 +-
src/mirall/syncengine.cpp | 27 +-
src/mirall/syncengine.h | 4 +-
src/mirall/syncfileitem.h | 3 +-
src/mirall/syncjournaldb.cpp | 40 +-
src/mirall/syncjournaldb.h | 11 +-
src/mirall/syncresult.h | 3 +-
src/mirall/syncrunfilelog.cpp | 6 -
src/mirall/theme.cpp | 9 +-
src/mirall/theme.h | 6 +-
src/mirall/utility.cpp | 31 +-
src/mirall/utility.h | 48 +-
src/mirall/utility_unix.cpp | 19 +-
src/owncloudcmd/owncloudcmd.cpp | 2 +-
translations/mirall_ca.ts | 525 +++++++++---------
translations/mirall_cs.ts | 462 ++++++++--------
translations/mirall_de.ts | 460 ++++++++--------
translations/mirall_el.ts | 464 ++++++++--------
translations/mirall_en.ts | 454 ++++++++--------
translations/mirall_es.ts | 462 ++++++++--------
translations/mirall_es_AR.ts | 458 ++++++++--------
translations/mirall_et.ts | 460 ++++++++--------
translations/mirall_eu.ts | 458 ++++++++--------
translations/mirall_fa.ts | 456 ++++++++--------
translations/mirall_fi.ts | 482 ++++++++--------
translations/mirall_fr.ts | 470 ++++++++--------
translations/mirall_gl.ts | 462 ++++++++--------
translations/mirall_hu.ts | 458 ++++++++--------
translations/mirall_it.ts | 460 ++++++++--------
translations/mirall_ja.ts | 458 ++++++++--------
translations/mirall_nl.ts | 462 ++++++++--------
translations/mirall_pl.ts | 462 ++++++++--------
translations/mirall_pt.ts | 460 ++++++++--------
translations/mirall_pt_BR.ts | 466 ++++++++--------
translations/mirall_ru.ts | 458 ++++++++--------
translations/mirall_sk.ts | 603 +++++++++++----------
translations/mirall_sl.ts | 462 ++++++++--------
translations/mirall_sv.ts | 470 ++++++++--------
translations/mirall_th.ts | 456 ++++++++--------
translations/mirall_tr.ts | 530 +++++++++---------
translations/mirall_uk.ts | 456 ++++++++--------
translations/mirall_zh_CN.ts | 456 ++++++++--------
translations/mirall_zh_TW.ts | 456 ++++++++--------
111 files changed, 7996 insertions(+), 6884 deletions(-)
create mode 100644 csync/tests/ownCloud/toremote1/My Document.doc
create mode 100644 csync/tests/ownCloud/toremote1/kernelcrash.txt
create mode 100644 csync/tests/ownCloud/toremote1/kraft_logo.gif
delete mode 100644 csync/tests/ownCloud/toremote1/rtl2/mettre.xls
copy test/manual/favlink/main.cpp => src/mirall/owncloudlib.h (65%)
--
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