[Pkg-owncloud-commits] [owncloud-client] branch upstream updated (531a12b -> 5173a4b)

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Oct 25 09:10:51 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  531a12b   Imported Upstream version 1.7.0~beta3+dfsg
       new  1579c23   Fix order in which credentials are getting fetched
       new  51109ea   [tx-robot] updated from transifex
       new  9bd7ffe   blacklist: Fix stale blacklist removal. #2247
       new  708655d   fix incomplete rename
       new  285cb78   Sync scheduling: Don't always force-sync. #2268
       new  b6d97cf   OS X Overlay Icons: Introduce a short term cache for rendered icons
       new  6fbd28d   Merge branch 'overlayicon_cache' into 1.7
       new  48d3c75   GET: Retry if bad range header used. #2280
       new  705cd57   Download: Don't store message body if status != 2xx #2280
       new  9d5d6af   Q_DECL_OVERRIDE for Qt4 only for GCC >= 4.7
       new  6c8eab7   Remove C++11ism that doesn't work with older GCCs
       new  4f2fb4a   [tx-robot] updated from transifex
       new  886f9d8   Sync scheduling: Improve logging. #2275
       new  11fe0c5   csync statedb: Open the statedb in read only mode and with mutex set.
       new  27318dd   csync statedb: Issue a warning if sqlite is not compiled thread safe.
       new  edf7cd2   csync statedb: Set PRAGMA synchronous to NORMAL for read only db.
       new  425d0d7   Two little typo fixes.
       new  04558be   SyncJournal: Use the NOCASE Collate for blacklist query.
       new  d1c1a18   SyncJournal: Use precompiled statement in blacklist query.
       new  32fea65   Use climits for ULONG_MAX rather than modern C++ option
       new  dfba8fb   CheckServerJob: Require status code 200. #2290
       new  32aaecd   macdeployqt: Fix missing symbol
       new  9756050   Selective sync: change the text of the label.
       new  6de104a   Selective Sync: ensure that the blacklist contains the last '/'
       new  621a37b   Selective sync: Remove the etag of parent folders in the db when adding or removing items in the selective sync blacklist
       new  5314765   fix compile
       new  3149cd0   Sync scheduling: Never enqueue a folder while it is synced.
       new  4c83653   Selective sync: do not upload or rename file that would ends up in a not selected folder
       new  7eb10a0   SSL error dialog: Remove debug noise
       new  f0fef4f   OS X: Fix .app creation for non-system Qt
       new  61967f6   csync tests: conform to read only db.
       new  b20752f   Fix the build with clang and Qt4
       new  8a93437   [tx-robot] updated from transifex
       new  661fe5d   csync_statedb: fix inverted logic in testing if the sqlite was compiled with threads
       new  9bb89dc   Less offensive logging, only use error if there was one.
       new  75dbf12   CSync: Remove dead code
       new  b01839e   OS X: Remove dead JSON code
       new  f8f5a7c   OS X Overlay Icons: Fix static analyzer warnings
       new  d880f2f   propagator: Do not show an error message saying it was done by user interaction if it was not
       new  c4f96c2   owncloudcmd: Implement --version, fix strings
       new  3ebe3b1   Use local socket (named pipe) connection also on Windows
       new  76f5266   Fix small inefficiency in socketapi
       new  100d136   Add Folder wizard: Sort the folders when selecting the remote folder
       new  2149092   owncloudcmd: Fix crash
       new  77d2cba   owncloudcmd: don't prompt for password if it was provided
       new  631e679   [tx-robot] updated from transifex
       new  8eaeba6   owncloudcmd: Fix url handling with csync, make owncloudcmd sync again.
       new  d491663   owncloudcmd: Fix some slash screwup, to make the split succeed bug #2211
       new  9b178c5   Sync engine: Do not write to the database too early
       new  282abdd   Sync engine:  Restart sync when we get a precondition failed error
       new  2f5cea0   owncloudcmd: Add a custom ssl verification callback for neon.
       new  7e898cf   SelectiveSync:  rename blacklist to selectiveSyncBlackList in some places
       new  ef48de3   Logger: Log the thread pointer
       new  bbcb8ba   credentials: Allow to trust ssl certs in subclasses of HTTPCredentials.
       new  ab40ba2   owncloudcmd: Handle trust ssl switch correctly by overwriting trustssl
       new  b285e98   SQlite: Print versions we use
       new  0cde7c8   [tx-robot] updated from transifex
       new  07bcaae   unreachable --version code made reachable. error message improved.
       new  0a96aa3   Merge pull request #2307 from owncloud/fix-version-jw
       new  a452a05   [tx-robot] updated from transifex
       new  8231bc9   [tx-robot] updated from transifex
       new  4b001a7   Windows Shell Integration: Use the QLocalSocket on windo and do the request assynchroniously
       new  b4c86bc   [tx-robot] updated from transifex
       new  03ee742   Correct lookup logic for Qt translations
       new  e66ca26   Windows Shell Integration: try to wait for connection
       new  aa0f2c6   Windows Shell Integration: fixeWindows Shell Integration: fixe
       new  bb37e93   Windows shell integration: Do proper wait
       new  7804bf0   Windows Shell Integration: Use the right parametter to SHChangeNotify
       new  10175c8   Update binary/ sha
       new  2bba413   owncloudgui: Fix a small leak
       new  6096362   [tx-robot] updated from transifex
       new  4527784   Second part of #1661
       new  681c436   [tx-robot] updated from transifex
       new  d441791   Discovery phase: Properly decode percent encoding
       new  dee6d18   Discovery phase: Improve UI by quoting folder names
       new  4525161   Updater: allow overriding update URL through environment
       new  d08c2de   Use sqlite C api.
       new  46fd796   JournalDb: Do not use static variable for path.
       new  8371e34   Nautilus overlay: minor cleanups
       new  561e3c7   socketapi: if the filename is empty, it's actually /
       new  dd28a64   SocketAPI: Cleanup, removed helper namespace, added as private methods.
       new  26ffa07   SocketAPI: Cache database conections and statements
       new  09b0ba3   Sql: New implementation of ownSql class to go away from Qt's own Sql
       new  f1ce0a1   SocketAPI: Use non-recursive (heuristic) computation of icons
       new  4d30204   SocketAPI: Remove old dbFileRecord function
       new  eb60aca   SyncJournalDB: Clarify debug message
       new  e7d9ec5   Merge branch 'sqlite_capi' of github.com:owncloud/mirall into sqlite_capi
       new  357c08c   NewSQL: minor fixes to get stuff going
       new  6b5fcf5   Test module for the new sql implementation.
       new  0094c1e   Make the sync work with new sql implementation.
       new  74ec90c   tx.pl: Fix sharing api url, some whitespace fixes.
       new  eeb5ca4   ownsql: Added some paranthisis to make clear whats happening.
       new  babe891   SyncEngine: Show a warning if post update script can not be exec.
       new  336c95c   ownsql: Cleanups: In modern C++, we use 0 instead of NULL
       new  6c92076   tx.pl: Adopt test t6.pl to the new way of handling precondition failed.
       new  89c51e7   ownsql: Implement the transaction functions.
       new  ee8a93a   ownSql: Proper initialization of errId
       new  8c7953a   ownSql: Proper initialization of result value plus assert on it.
       new  e51c299   ownSql: create an null value of an empty string in bindValue.
       new  36eaff9   JournalDb: Some Sql statement fixes, make t7 work again.
       new  dbad1a8   ownSql: Don't allow copying of SqlQuery
       new  707d688   main: Show console message if already running
       new  2d420cd   ownSql: Always use SQLITE_TRANSIENT
       new  1d5b3aa   sqlite3: Bundle 3.8.6 for Mac and Windows
       new  b1c10c8   Remove references to qsqlite3
       new  2f740fe   tests: Added unicode read an write testcase for ownsql.
       new  c66c012   Beautified some debug logging strings.
       new  b984958   ReNautilus Shell Intgration: Remove debug output
       new  52a5729   Merge pull request #2319 from owncloud/sqlite_capi
       new  e5ef5f2   Revert "socketapi: if the filename is empty, it's actually /"
       new  93c8571   ownSql: Always use finish()
       new  f1006ca   owncloudcmd: Always need exclude list
       new  0815618   Revert "propagator: Do not check for case clash when renaming"
       new  a5bd437   Propagator: Fix renaming of files and case confflicts
       new  3021fb5   NSIS: Fix copying of qtbase translations
       new  306b635   [tx-robot] updated from transifex
       new  7822a6b   csync_statedb: Finalize the precompiled statements after discovery.
       new  b5736fb   Sql: Handle SQLITE_BUSY properly for sqlite3_step and sqlite3_prepare.
       new  79e2c13   [tx-robot] updated from transifex
       new  271cdac   Really use internal SQLite on Windows
       new  7c24db0   [tx-robot] updated from transifex
       new  6048a71   Revert "Remove references to qsqlite3"
       new  ac48fba   1.7.0 beta4
       new  2dfe0ed   Remove unused variable, fixes compile warning.
       new  3fcb0d2   SocketAPI: Properly release precompiled statements. Use sqlite3_close
       new  704c5f2   NetworkJobs: Higher timeout for pre-oC7
       new  cb36a37   SyncEngine/SyncJournalDB: Fix creation of .csync_journal
       new  8b35cda   SyncEngine: Refactor startSync() code
       new  7dbb98c   SyncEngine/SyncJournalDB: Don't keep transactions open
       new  53b3e5a   SocketAPI: Use new class SqlQuery to cache the sql queries.
       new  2f20f3c   SocketApi: Instanziate Object to call QFileInfo::exists
       new  04b62b1   Fix compile error and add warning.
       new  2de22b4   SyncEngine: Avoid transaction warning
       new  f0dc372   ownSql: Still also use sqlite3 busy handler
       new  26f068b   SocketApi: Properly manage the database connections.
       new  d33b68c   CSync: Error out if DB error
       new  d0ed82a   We need SqlDatabase and SqlQuery to be exported
       new  0fb779d   SyncEngine: De-initialize recursive PROPFIND value correctly
       new  5d048c1   Sqlite3: Switch to WAL
       new  d2be45b   [tx-robot] updated from transifex
       new  86d8079   Reconcile:  Make sure not to loose new files added in a directory removed on the server
       new  21c8e65   csync tests: Fix test after db changes.
       new  dd13ce3   Imported Upstream version 1.7.0~beta4+dfsg
       new  56316bc   csync_reconcile:  remove useless debug output
       new  5a109d9   Fix t3.pl
       new  98c5871   Windows shell integration: Add SHCNF_FLUSHNOWAIT to SHChangeNotify
       new  dc13e39   SocketAPI:  do not have a special case for UPDATE_VIEW on windows
       new  80e86d6   ownsql: fix warning with clang
       new  a76fc0e   SocketAPI: send the change of the parent folder in the broatcast
       new  1af480e   CMake: Fix RPATH
       new  fa70798   SyncJournalDB: WAL checkpoint at end of sync
       new  24d4840   SyncJournalDB: Set WAL files to hidden
       new  e5a0db8   SyncJournalDB: Fix version table filling up
       new  d7ac878   SyncJournalDB: Fix deleteBatch
       new  61e72ef   CSync: statedb sanity check changes
       new  a993496   SyncJournalDB/SyncEngine: Properly detect 1.5 upgrade
       new  8dc3f21   [tx-robot] updated from transifex
       new  3243365   JournalDb: Do not longer always have a write operation on version table.
       new  de48e65   Csync tests: Fix compile.
       new  d31ccac   SocketAPI: show an ignored icon for paused folders
       new  6073e3f   SocketAPI: do not show a progress icon in case of errors
       new  ba86988   Csync tests: Fix broken tests.
       new  ed51a45   Add title to selective sync dialog
       new  d77fcea   Csync tests: Don't use sqlite3_close_v2.
       new  3840186   Utility:  fix function signature
       new  4f367fa   SocketAPI:  Show an error for files inside the selective sync folders
       new  7740150   Selective Sync widget:  add a "Loading..." label
       new  dd45b44   t6.pl: pass the --insecure flag to curl so it works on the test machine
       new  39a0f28   Move qtmacgoodies module forward
       new  55dd149   SocketAPI: Less verbose
       new  6342e76   Wizard: Change misleading text
       new  22dd275   SocketAPI: Fix the shared symbol, including for owncloud6 Shared dir
       new  3be5600   t6.pl:  fix missing space in curl command
       new  020e19f   SocketAPI: Fix all files are new
       new  9330d2e   SocketAPI:  always clean the path and use the normal slash
       new  47ad4e3   CSync: Close/Reopen DB between update and reconcile
       new  bbd9098   Switch git submodule for qtmacgoodies back to shadone
       new  9f6d7eb   tests: use the ocs_url in the same semantics as the 1.6 branch.
       new  e46ab72   SocketAPI:  Show error when we are not allowed
       new  dab01e3   csync_update: add the perms in the log
       new  de56b75   protocolwidget: fix string that need to use plural translation
       new  83880ae   Add proper background for OS X installer
       new  c7c05ea   [tx-robot] updated from transifex
       new  e726e7a   util: Use canonicalFilePath to clean the path opened by explorer.
       new  0d9ae24   OwnCloudFinder: Rename to SyncStateFinder
       new  81584c6   VERSION.cmake: rc1
       new  e5269a4   Add SyncJournalDB autotests.
       new  114c38c   csync tests: add some debug code to get behind the jenkins fails.
       new  149b16a   Win32 Shell Integration: Use RegDeleteKey instead of RegDeleteKeyEx
       new  92c35c6   Update reference to binary submodule
       new  2120ff8   fix resources path and permissions
       new  3c7ff97   SocketAPI: Don't use a theme dependent name for now
       new  6d81e5c   [tx-robot] updated from transifex
       new  5640cbf   SqlDatabase: Make it non-copyable.
       new  c0ea69e   SqlQuery: Reset after each successful exec().
       new  f37b81c   Unregister path in socketapi before removing it.
       new  f5c1997   Followup: To unregister a path in socket api use the alias of folder.
       new  82b1437   Sync scheduling: Only retry up to twice after fail. #2386
       new  fce76a1   Sync scheduling: Only do a follow-up sync 3 times. #2355
       new  542e989   Setup Dialog: Terminate sync if the new folder is a an actual folder.
       new  a9d8e9d   Setupwizard: Close the database in case of moving the folder.
       new  c12d387   Merging work branch for a bug fix for bug #2379.
       new  86e13ea   FolderMan: Use folderForPath method to get the folder object for a path
       new  1c4072e   Selective sync ui: Fix #2390
       new  9505d7c   Updated changelog for 1.7.0
       new  0e828d8   Bump version to 1.7.0rc1
       new  d76192c   Ignore reserved words on Windows
       new  d0b40ba   Merge pull request #2391 from owncloud/ignore_windows_reserved_characters
       new  5173a4b   Imported Upstream version 1.7.0~rc1+dfsg

The 209 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:
 .gitmodules                                        |      2 +-
 .tag                                               |      2 +-
 CMakeLists.txt                                     |      6 +
 ChangeLog                                          |     46 +
 VERSION.cmake                                      |      2 +-
 cmake/modules/DefineCompilerFlags.cmake            |      3 +-
 cmake/modules/FindSQLite3.cmake                    |     14 +-
 cmake/modules/NSIS.template.in                     |      1 +
 cmake/modules/QtVersionAbstraction.cmake           |     13 +-
 csync/src/CMakeLists.txt                           |     11 +-
 csync/src/csync.c                                  |     30 +-
 csync/src/csync_exclude.c                          |     41 +
 csync/src/csync_exclude.h                          |      8 +
 csync/src/csync_owncloud.c                         |      3 +-
 csync/src/csync_private.h                          |      6 +-
 csync/src/csync_reconcile.c                        |      5 +
 csync/src/csync_statedb.c                          |    183 +-
 csync/src/csync_statedb.h                          |     21 -
 csync/src/csync_update.c                           |     68 +-
 csync/src/std/c_string.c                           |      8 +
 csync/src/std/c_string.h                           |     11 +
 csync/tests/csync_tests/check_csync_exclude.c      |     20 +
 csync/tests/csync_tests/check_csync_statedb_load.c |     39 +-
 .../tests/csync_tests/check_csync_statedb_query.c  |     93 +-
 csync/tests/csync_tests/check_csync_update.c       |     98 +-
 csync/tests/ownCloud/ownCloud/Test.pm              |     60 +-
 csync/tests/ownCloud/t1.pl                         |     33 +-
 csync/tests/ownCloud/t3.pl                         |      5 +-
 csync/tests/ownCloud/t6.pl                         |     51 +-
 csync/tests/ownCloud/t8.pl                         |      9 +-
 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/nautilus/syncstate.py            |     16 +-
 .../OCShellExtensions/OCOverlays/DllMain.cpp       |    204 -
 .../OCShellExtensions/OCOverlays/OCOverlay.cpp     |    187 -
 .../OCShellExtensions/OCOverlays/OCOverlay.h       |     50 -
 .../OCShellExtensions/OCOverlays/OCOverlay.rc      |    Bin 6122 -> 0 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 30166 -> 0 bytes
 .../OCOverlays/ico/Error_Shared.ico                |    Bin 30166 -> 0 bytes
 .../OCShellExtensions/OCOverlays/ico/OK.ico        |    Bin 30166 -> 0 bytes
 .../OCShellExtensions/OCOverlays/ico/OK_Shared.ico |    Bin 30166 -> 0 bytes
 .../OCShellExtensions/OCOverlays/ico/Sync.ico      |    Bin 30166 -> 0 bytes
 .../OCOverlays/ico/Sync_Shared.ico                 |    Bin 30166 -> 0 bytes
 .../OCShellExtensions/OCOverlays/ico/Warning.ico   |    Bin 30166 -> 0 bytes
 .../OCOverlays/ico/Warning_Shared.ico              |    Bin 30166 -> 0 bytes
 .../OCShellExtensions/OCOverlays/resource.h        |    Bin 1536 -> 0 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/3rdparty/sqlite3/sqlite3.c                     | 148882 ++++++++++++++++++
 src/3rdparty/sqlite3/sqlite3.h                     |   7494 +
 src/CMakeLists.txt                                 |     16 +-
 src/creds/httpcredentials.cpp                      |      6 +-
 src/creds/httpcredentials.h                        |      1 +
 src/main.cpp                                       |      1 +
 src/mirall/accountsettings.cpp                     |      2 +-
 src/mirall/application.cpp                         |     13 +-
 src/mirall/discoveryphase.cpp                      |     25 +-
 src/mirall/discoveryphase.h                        |      4 +-
 src/mirall/folder.cpp                              |    186 +-
 src/mirall/folder.h                                |     28 +-
 src/mirall/folderman.cpp                           |     38 +-
 src/mirall/folderwatcher.cpp                       |      2 +-
 src/mirall/folderwizard.cpp                        |      3 +
 src/mirall/logger.cpp                              |      2 +
 src/mirall/mirallconfigfile.cpp                    |     46 +-
 src/mirall/mirallconfigfile.h                      |      1 +
 src/mirall/networkjobs.cpp                         |     19 +-
 src/mirall/networkjobs.h                           |      3 +
 src/mirall/openfilemanager.cpp                     |     26 +-
 src/mirall/owncloudgui.cpp                         |     17 +-
 src/mirall/owncloudgui.h                           |      2 +-
 src/mirall/owncloudpropagator.cpp                  |      9 +-
 src/mirall/owncloudsetupwizard.cpp                 |      8 +-
 src/mirall/owncloudtheme.cpp                       |      2 +-
 src/mirall/ownsql.cpp                              |    292 +
 src/mirall/ownsql.h                                |     84 +
 src/mirall/propagator_qnam.cpp                     |     83 +-
 src/mirall/propagatorjobs.cpp                      |     11 +
 src/mirall/protocolwidget.cpp                      |      6 +-
 src/mirall/selectivesyncdialog.cpp                 |     28 +-
 src/mirall/selectivesyncdialog.h                   |      8 +-
 src/mirall/socketapi.cpp                           |    444 +-
 src/mirall/socketapi.h                             |     27 +-
 src/mirall/sslerrordialog.cpp                      |      5 +-
 src/mirall/syncengine.cpp                          |    147 +-
 src/mirall/syncengine.h                            |     10 +-
 src/mirall/syncfileitem.h                          |     17 +-
 src/mirall/syncjournaldb.cpp                       |    582 +-
 src/mirall/syncjournaldb.h                         |     40 +-
 src/mirall/syncjournalfilerecord.cpp               |     14 +
 src/mirall/syncjournalfilerecord.h                 |      3 +
 src/mirall/utility.cpp                             |     23 +-
 src/mirall/utility.h                               |      6 +-
 src/owncloudcmd/owncloudcmd.cpp                    |    167 +-
 src/updater/updater.cpp                            |      6 +-
 src/wizard/owncloudadvancedsetuppage.cpp           |      3 +-
 test/CMakeLists.txt                                |      3 +
 test/testownsql.h                                  |    155 +
 test/testsyncjournaldb.h                           |    118 +
 translations/mirall_ca.ts                          |    398 +-
 translations/mirall_cs.ts                          |    406 +-
 translations/mirall_de.ts                          |    404 +-
 translations/mirall_el.ts                          |    414 +-
 translations/mirall_en.ts                          |    398 +-
 translations/mirall_es.ts                          |    404 +-
 translations/mirall_es_AR.ts                       |    396 +-
 translations/mirall_et.ts                          |    422 +-
 translations/mirall_eu.ts                          |    398 +-
 translations/mirall_fa.ts                          |    395 +-
 translations/mirall_fi.ts                          |    401 +-
 translations/mirall_fr.ts                          |    466 +-
 translations/mirall_gl.ts                          |    398 +-
 translations/mirall_hu.ts                          |    395 +-
 translations/mirall_it.ts                          |    402 +-
 translations/mirall_ja.ts                          |    402 +-
 translations/mirall_nl.ts                          |    404 +-
 translations/mirall_pl.ts                          |    402 +-
 translations/mirall_pt.ts                          |    426 +-
 translations/mirall_pt_BR.ts                       |    402 +-
 translations/mirall_ru.ts                          |    400 +-
 translations/mirall_sk.ts                          |    397 +-
 translations/mirall_sl.ts                          |    404 +-
 translations/mirall_sv.ts                          |    424 +-
 translations/mirall_th.ts                          |    395 +-
 translations/mirall_tr.ts                          |    402 +-
 translations/mirall_uk.ts                          |    952 +-
 translations/mirall_zh_CN.ts                       |    395 +-
 translations/mirall_zh_TW.ts                       |    395 +-
 201 files changed, 165376 insertions(+), 26132 deletions(-)
 delete mode 100644 shell_integration/MacOSX/CMakeLists.txt
 delete mode 100644 shell_integration/MacOSX/OwnCloud.xcworkspace/contents.xcworkspacedata
 delete mode 100644 shell_integration/MacOSX/OwnCloud.xcworkspace/xcshareddata/OwnCloud.xccheckout
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/ContentManager.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/ContentManager.m
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.m
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/ContextMenuHandlers.m.unc
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/English.lproj/InfoPlist.strings
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/Finder/Finder.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/FinderHook.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/FinderHook.m
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/GCDAsyncSocket.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/GCDAsyncSocket.m
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/IconCache.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/IconCache.m
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/IconOverlayHandlers.m
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/Info.plist
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/JSONKit.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/JSONKit.m
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/MenuManager.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/MenuManager.m
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/project.pbxproj
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/OwnCloudFinder.xcodeproj/xcuserdata/guruz.xcuserdatad/xcschemes/xcschememanagement.plist
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/RequestManager.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudFinder/RequestManager.m
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/English.lproj/InfoPlist.strings
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/Info.plist
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/LNStandardVersionComparator.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/LNStandardVersionComparator.m
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/LNVersionComparisonProtocol.h
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.m
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.sdef
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/project.pbxproj
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/xcshareddata/xcschemes/OwnCloudFinder.osax.xcscheme
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.xcodeproj/xcuserdata/guruz.xcuserdatad/xcschemes/xcschememanagement.plist
 delete mode 100644 shell_integration/MacOSX/OwnCloudInjector/license.txt
 delete mode 100644 shell_integration/MacOSX/check.scpt
 delete mode 100644 shell_integration/MacOSX/deploy.sh
 delete mode 100644 shell_integration/MacOSX/load.scpt
 delete mode 100755 shell_integration/MacOSX/loadPlugin.sh
 delete mode 100644 shell_integration/MacOSX/unload.scpt
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/DllMain.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlay.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlay.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlay.rc
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayFactory.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayFactory.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlayRegistrationHandler.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlays.def
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/OCOverlays.vcxproj
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/OverlayConstants.h.original
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/ico/Error.ico
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/ico/Error_Shared.ico
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/ico/OK.ico
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/ico/OK_Shared.ico
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/ico/Sync.ico
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/ico/Sync_Shared.ico
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/ico/Warning.ico
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/ico/Warning_Shared.ico
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/resource.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCOverlays/stdafx.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCShellExtensions.sln
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/CommunicationSocket.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/CommunicationSocket.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/FileUtil.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/FileUtil.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/OCMessage.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/OCMessage.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/OCUtil.vcxproj
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/ParserUtil.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/RegistryUtil.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/RegistryUtil.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/RemotePathChecker.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/RemotePathChecker.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/StringUtil.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/StringUtil.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtil/UtilConstants.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtilTest/OCUtilTest.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtilTest/OCUtilTest.filters
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtilTest/OCUtilTest.vcxproj
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtilTest/ReadMe.txt
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtilTest/stdafx.cpp
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtilTest/stdafx.h
 delete mode 100644 shell_integration/windows/OCShellExtensions/OCUtilTest/targetver.h
 create mode 100644 src/3rdparty/sqlite3/sqlite3.c
 create mode 100644 src/3rdparty/sqlite3/sqlite3.h
 create mode 100644 src/mirall/ownsql.cpp
 create mode 100644 src/mirall/ownsql.h
 create mode 100644 test/testownsql.h
 create mode 100644 test/testsyncjournaldb.h

-- 
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