a7c0cfc8eb
If the server has the 'uploadConflictFiles' capability conflict files will be uploaded instead of ignored. Uploaded conflict files have the following headers set during upload OC-Conflict: 1 OC-ConflictBaseFileId: 172489174instanceid OC-ConflictBaseMtime: 1235789213 OC-ConflictBaseEtag: myetag when the data is available. Downloads accept the same headers in return when downloading a conflict file. In the absence of server support clients will identify conflict files through the file name pattern and attempt to deduce the base fileid. Base etag and mtime can't be deduced though. The upload job for a new conflict file will be triggered directly from the job that created the conflict file now. No second sync run is necessary anymore. This commit does not yet introduce a 'username' like identifier that automatically gets added to conflict file filenames (to name the files foo_conflict-Fred-1345.txt instead of just foo_conflict-1345.txt). |
||
|---|---|---|
| .github | ||
| admin | ||
| binary@3425fab2c6 | ||
| cmake | ||
| doc | ||
| man | ||
| resources | ||
| shell_integration | ||
| src | ||
| test | ||
| theme | ||
| translations | ||
| .clang-format | ||
| .git-blame-ignore-revs | ||
| .gitattributes | ||
| .gitignore | ||
| .gitmodules | ||
| .tag | ||
| .travis.yml | ||
| ChangeLog | ||
| client.qrc | ||
| CMakeLists.txt | ||
| config.h.in | ||
| CONTRIBUTING.md | ||
| COPYING | ||
| COPYING.documentation | ||
| CPackOptions.cmake.in | ||
| Jenkinsfile | ||
| mirall.desktop.in | ||
| OWNCLOUD.cmake | ||
| OwnCloudCPack.cmake | ||
| README.md | ||
| sync-exclude.lst | ||
| theme.qrc | ||
| VERSION.cmake | ||
| version.h.in | ||
ownCloud Desktop Client
Introduction
The ownCloud Desktop Client is a tool to synchronize files from ownCloud Server with your computer.
Download
Binary packages
- Refer to the download page https://owncloud.org/install/#install-clients
Source code
The ownCloud Desktop Client is developed in Git. Since Git makes it easy to fork and improve the source code and to adapt it to your need, many copies can be found on the Internet, in particular on GitHub. However, the authoritative repository maintained by the developers is located at https://github.com/owncloud/client.
Building the source code
Building the Client in the ownCloud Desktop Client manual.
Maintainers and Contributors
The maintainers of this repository are:
- Klaas Freitag freitag@owncloud.com
- Daniel Molkentin danimo@owncloud.com
- Markus Goetz guruz@owncloud.com
- Olivier Goffart ogoffart@owncloud.com
ownCloud Desktop Client is developed by the ownCloud community and receives patches from a variety of authors.
Reporting issues and contributing
If you find any bugs or have any suggestion for improvement, please file an issue at https://github.com/owncloud/client/issues. Do not contact the authors directly by mail, as this increases the chance of your report being lost.
If you created a patch, please submit a Pull Request. For non-trivial patches, we need you to sign the Contributor Agreement before we can accept your patch.
If you want to contact us, e.g. before starting a more complex feature, you can join us at #owncloud-client-dev.
License
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
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.