nextcloud-desktop-pachulo:upstream/pr/6452

Last commit made on 2018-06-01
Get this branch:
git clone -b upstream/pr/6452 https://git.launchpad.net/nextcloud-desktop-pachulo

Branch merges

Branch information

Name:
upstream/pr/6452
Repository:
lp:nextcloud-desktop-pachulo

Recent commits

d53e62d... by Christian Kamm <email address hidden>

Share dialog: Don't hide account settings before showing #6185

At least on windows and linux. OSX would need tests first since
the addition was originally supposed to help with OSX problems,
see #3783.

335298f... by Roeland Jago Douma <email address hidden>

Merge pull request #312 from nextcloud/upstream/pr/6374

Move ClientProxy and and ConnectionValidator out of libsync

1b587a1... by Olivier Goffart <email address hidden>

ConnectionValidator::Status use Q_ENUM

So no need to have a manual conversion to QString
This is only used in debug message anyway.

311307e... by Olivier Goffart <email address hidden>

Move ClientProxy and ConnecitonValidator to gui

They are using the ConfigFile and are used to control
when to sync rather than for the sync itself

7e05e1e... by Olivier Goffart <email address hidden>

owncloudcmd: Do not overwrite the http timeout for json jobs

The AbstractNetworkJob already has a sensible timeout that depends
on an environment variable.
No need to overwrite that with some arbitrary value. (The connection
validator does that because it could cause problems if two connection
validator were to run at the same time. Not a problem here)

204cb47... by Olivier Goffart <email address hidden>

owncloudcmd: Do not read the proxy settings from the gui's config file

The proxy settings for the owncloudcmd client can be set via the
--httpproxy command line argument. owncloudcmd should not depends
on the gui's config

9fe8713... by Olivier Goffart <email address hidden>

Folder: remove unused member

08024f6... by Nextcloud bot <email address hidden>

[tx-robot] updated from transifex

c6ef8ee... by Roeland Jago Douma <email address hidden>

Merge pull request #305 from nextcloud/upstream/pr/6363

SyncEngine: Use separate state for two unicode conversions

86741de... by Roeland Jago Douma <email address hidden>

Merge pull request #299 from nextcloud/upstream/pr/6349

Don't delete contents behind directory junctions #6322