1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-10-23 06:42:49 +02:00
Commit Graph

391 Commits

Author SHA1 Message Date
Roeland Jago Douma
fe4bb52a6d
Merge remote-tracking branch 'oc/master' into oc_up 2017-12-14 10:27:11 +01:00
Olivier Goffart
e0a14cac5b ConfigFile: use QStandardPaths::AppConfigLocation for the config file
Also use appName instead of appNameGui in order to compute the path

Issue: #2245

The reason is to respect the XDG spec on Unix (#1601) and might help
on windows roaming profiles (#684)
2017-12-07 17:39:16 +01:00
Olivier Goffart
ed5385faa3 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libsync/connectionvalidator.cpp
     	src/libsync/networkjobs.cpp
2017-12-05 15:58:13 +01:00
Hefee
1a1ab92ed9 make doc-man working again. 2017-12-04 12:37:30 +01:00
Terence Eden
e6be710cdb
Typo in documentation
Fixes #63
2017-11-25 10:03:36 +00:00
Christian Kamm
aafe7c4732 Merge remote-tracking branch 'origin/2.4' 2017-11-20 11:54:56 +01:00
Michael Stingl
d832312acc Add 2.3.3 System Requirements to client repo (#5996)
I would like to maintain the System Requirements in the client repo.
2017-11-17 15:05:42 +01:00
Matthew Setter
b13fd786b6 Fix broken download link 2017-11-14 12:25:48 +01:00
Matthew Setter
89d55d0af8 Fix broken images in the FAQ 2017-11-14 12:25:48 +01:00
Matthew Setter
d46335aba1 Minor formatting fixes
Fix broken header and table
2017-11-14 12:25:48 +01:00
Matthew Setter
e417a4b159 Fix title casing to match style guide 2017-11-14 12:25:48 +01:00
Christian Kamm
05c1bfb6cf Merge remote-tracking branch 'origin/2.4' 2017-10-27 10:29:31 +02:00
Christian Kamm
e85a339d94 Local discovery: Use db instead of filesystem
We mostly trust the file watchers meaning that we don't re-scan the
local tree if we have done that recently and no file watcher events
have arrived. If the file watchers invalidate a subtree, we rescan
only that subtree.

Since we're not entirely sure the file watchers are reliable, we still
do full local discoveries regularly (1h by default). There is a config
file setting as well as an environment variable to control the interval.
2017-10-24 10:00:20 +02:00
Dominik Schmidt
7f51803d04 Only use $(MAKE) in doc target if make is used as generator
The old behavior broke builds with other CMake generators like Ninja as it obviously has no concept of $(MAKE)
2017-10-17 12:50:34 +02:00
Christian Kamm
096cd348f0 Doc: Update FAQ entry on deeply nested directories #1067 2017-10-11 16:01:46 +02:00
Christian Kamm
82e87805c3 Packaging: Change directory for docs #5957
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-09-27 09:13:44 +02:00
Olivier Goffart
8f5110900c Gui: Allow to add multiple sync folder connection of the same folder
... or child folders

There is also no real reason to forbid the user from syncing the same
folder to multiple location on its hardrive.
A real use case is when the user uncheck a big directory using "choose
what to sync", but would still like to sync a folder within this disabled
tree. The user can now do this with the "add folder" feature

Since 2.3, we even support syncing the same local folder to multiple
remote folder, so why not allow syncing the same remote folder several
times?

Relates to issue #3645
2017-09-18 15:17:06 +02:00
Jocelyn Turcotte
013eba0e79 Update sync-algorithm.md
The rbtree was replaced by a std::map.
2017-09-18 14:00:52 +02:00
Matthew Setter
ab8061a57f Fix link to download the ownCloud client
This was requested in https://github.com/owncloud/documentation/issues/3354.
2017-09-06 09:09:14 +02:00
Matthew Setter
f414355680 Fix broken images in FAQ
This relates to https://github.com/owncloud/documentation/issues/3354.
2017-09-06 09:08:53 +02:00
Martin
6e47d9a2e5 Documentation improvement for #5969 2017-08-20 18:17:58 +02:00
Matthew Setter
119ecb4259 Merge pull request #5762 from owncloud/update-docs-to-2.3.2
Update client docs version string to 2.3.2
2017-08-03 13:56:39 +02:00
Matthew Setter
8bd047174a Update client docs version string to 2.4.0
Need to update this to match the latest version.
2017-08-01 17:28:50 +02:00
Matthew Setter
3731eba9b6 Clean up the client docs removing old, outdated, content
This makes changes as suggested by @michaelstingl in
https://github.com/owncloud/documentation/issues/3240.
2017-07-31 14:04:02 +02:00
Olivier Goffart
075c423c62 buildint.rst: Put back reference to openssl on windows
OpenSSL might no longer be needed to build the client, but we still need
it to run it.

That reverts part of commit 6e57b0219e for
this file.

Fix #5858
Reported in https://central.owncloud.org/t/locally-built-client-error-creating-ssl-context/8264
2017-07-21 08:57:57 +02:00
Jürgen Weigert
186f16e688 Update building.rst 2017-07-07 16:01:20 +02:00
Olivier Goffart
6e57b0219e Don't link dirrectly against openssl
All our crypto code is handled by qt nodaways.
No need to carry this dependency.

Especially since it causes warnings on system where there are
twp openssl version installed:
/usr/bin/ld: warning: libcrypto.so.1.0.0, needed by /usr/lib/libQt5Network.so.5.9.0, may conflict with libcrypto.so.1.1
2017-06-13 11:27:23 +02:00
Christian Kamm
5eaae83a01 Merge remote-tracking branch 'origin/2.3' 2017-05-17 13:10:19 +02:00
Matthew Setter
84e9400742 Add explanation of how to replace local sync folder to FAQ
This fixes owncloud/documentation/issues/2923.

(cherry picked from commit 6580af65c1)
2017-05-11 12:07:33 +02:00
Matthew Setter
3185b0940b Increase the clarity of the checksum statements
This comes after discussion and feedback with @phil-davis.
2017-05-03 13:17:09 +02:00
Matthew Setter
013a0e25d5 Document the checksums addition in 10.0
This commit documents the new checksums addition in 10.0, specifically
in the desktop client. This fixes owncloud/documentation/issues/2964.
2017-05-02 12:48:08 +02:00
Olivier Goffart
1ed4eb46f2 Merge remote-tracking branch 'origin/2.3'
Conflicts:
	VERSION.cmake
2017-04-13 10:19:35 +02:00
Christian Kamm
29e34bd2c0 Doc: Update to new sync journal db name #5662 2017-04-04 10:49:26 +02:00
Christian Kamm
2841714817 owncloudcmd docs: Mention required sync-exclude.lst #5679 2017-04-04 09:38:23 +02:00
Samuel Alfageme
ae018eab42 Fixing a duplicate in the build instructions
- The duplicate and some typos were introduced in 42aed56a5a 
- Also fixes some minor format issues. There's a lot of notes in this docs, we should refactor some.
2017-04-03 21:19:39 +02:00
Jürgen Weigert
e2cda2dc65 Update CMakeLists.txt
remove doc-man target in doc/CMakeLists.txt https://github.com/owncloud/client/issues/2153
2017-03-24 18:31:29 +01:00
ajasja
090d02a65f Documented the usage of environment variables.
In particular the `OWNCLOUD_CHUNK_SIZE` as requested per #2449.
I looked through the code and it seems the env vars override the conf file, but I'm not 100 % sure.
The `OWNCLOUD_CRITICAL_FREE_SPACE_BYTES` and `OWNCLOUD_FREE_SPACE_BYTES` are now mentioned in two places.
2017-03-24 12:26:46 +01:00
Matthew Setter
9840ae9e96 Fix incorrect documentation for the ownCloud command-line client
This fixes #5609.
2017-03-20 17:29:16 +01:00
Samuel Alfageme
d375e9b86c Including some info on the proxy config. in the docs.
This was a request of @michaelstingl to document how to configure the proxy manually via the .cfg file for config provisioning purposes.
- Restructured the bullet points into 3 different tables; I believe it's a cleaner approach; maybe this is also applicable to other sections.
- Would be logical to include also settings on proxy auth?
2017-03-20 11:55:02 +01:00
Matthew Setter
9af7e8cff0 Revise the point about starting a clean sync
On review, after feedback from @phil-davis, he's right that users need
to be fully briefed as to the implications of choosing a clean sync —
especially when they have a large amount of data in their account.
2017-03-10 08:35:55 +01:00
Matthew Setter
6580af65c1 Add explanation of how to replace local sync folder to FAQ
This fixes owncloud/documentation/issues/2923.
2017-03-07 15:41:24 +01:00
Matthew Setter
6e4ecd11a1 Update client version from 2.2 to 2.3 (#5568)
As the latest version of 2.3, the version information needs to be
updated as well.
2017-03-01 13:26:49 +01:00
Matthew Setter
488b964c52 Merge branch 'master' into fix-documentation-build-process 2017-02-21 12:07:57 +01:00
Matthew Setter
b4d3f696bf Re-add the Makefile for controlling the build process
I'm not sure, why the file was removed, it was there in 2013, but it was
removed. This commit adds it back so that the build process can be
automated in a UNIX environment.
2017-02-21 11:58:15 +01:00
Matthew Setter
9cc4d363b2 Fix the Sphinx-doc build configuration
I'm not sure what the configuration/setup has been like to date. But as
it stood, it didn't build successfully. Given that, I've created a copy
of doc/conf.py, included in this commit, from the default doc/conf.py.in
and set the appropriate variables as necessary.

NOTE: The build didn't work when the version, release, and latex_logo
values weren't set, either directly or with interpolatable values.
2017-02-21 11:49:23 +01:00
Matthew Setter
b646caffd0 Merge pull request #5547 from owncloud/update-docs-build-configuration
Create a build configuration file
2017-02-21 09:37:01 +01:00
Matthew Setter
b9bc3e36b8 Merge pull request #5545 from owncloud/grammar-updates
Fix grammar and spelling errors in the documentation
2017-02-21 09:28:55 +01:00
Matthew Setter
24aaf7a034 Create a build configuration file
This is no different from the default file, conf.py.in, except for the
specification of the logo file.
2017-02-20 11:04:01 +01:00
Matthew Setter
80f2e40e67 Fixed grammar and spelling errors in the documentation 2017-02-20 10:52:22 +01:00
Christian Kamm
006ce854a6 Doc: For conflicts, the local file is renamed #5521 2017-02-10 12:50:35 +01:00