Skip to content

fix: cleanup env vars for desktop client 7 #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DeepDiver1975 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: cleanup env vars for desktop client 7 #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions modules/ROOT/pages/advanced_usage/environment_variables.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ NOTE: Most environment variables only exist for debugging or testing purposes. T
| Default
| Description

| `OWNCLOUD_NO_TUS`
|
| Set to any value to disable uploads using the tus protocol

| `OWNCLOUD_TIMEOUT`
| 300
| The timeout for network connections in seconds.
Expand Down Expand Up @@ -76,10 +72,6 @@ Note that HTTP2 use also depends on whether the server supports it.
| Select the file checksumming algorithm.
"Adler32", "MD5", "SHA1", "SHA256", "SHA3-256" are valid, but not all have server support.

| `OWNCLOUD_UPLOAD_CONFLICT_FILES`
| unset
| Set to "1" to enable uploading conflict files to the server.

| `OWNCLOUD_OVERRIDE_SERVER_URL`
| unset
| Set to override a previously configured/branded server URL
Expand Down
10 changes: 0 additions & 10 deletions modules/ROOT/pages/conflicts.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,3 @@ The Desktop App notifies you of this situation via system notifications in the s

To resolve this conflict, open both files, compare the differences, and copy your local changes from the "conflicted copy" file to the base file, if applicable. In this example, you could change `mydata.txt` to say "local and remote contents" and delete the file with "conflicted copy" in its name. This will resolve the conflict.

== Force Uploading Conflicted Files

By default, the conflict file (the file with "conflicted copy" in its name that contains your local conflicting changes) is not uploaded to the server. The idea is that you, the author of the changes, are the best person for resolving the conflict and showing the conflict to other users might create confusion.

In some scenarios, however, it makes a lot of sense to upload these conflicting changes so that local work can become visible even if the conflict isn't resolved immediately. This can be achieved by setting the environment variable `OWNCLOUD_UPLOAD_CONFLICT_FILES=1` as a startup parameter when launching the Desktop App, such as, replace the path and filename according your operating system:

[source,cmd,subs="attributes+,macros+"]
----
OWNCLOUD_UPLOAD_CONFLICT_FILES=1 +'C:\Program Files\+{ini_name}+\+{bin_name}.exe'
----