nextcloud-desktop-pachulo:upstream/placeholder-files

Last commit made on 2018-08-29
Get this branch:
git clone -b upstream/placeholder-files https://git.launchpad.net/nextcloud-desktop-pachulo

Branch merges

Branch information

Name:
upstream/placeholder-files
Repository:
lp:nextcloud-desktop-pachulo

Recent commits

2e34eab... by Christian Kamm <email address hidden>

Wizard: Add a "(recommended)" to the main option #6470

0e71171... by Camila San <email address hidden>

Fixes qCInfo message messed up during merge.

Signed-off-by: Camila San <email address hidden>

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

Rename "placeholder" feature

c9167bd... by Samuel Alfageme <email address hidden>

Fix 'client/doc/conffile.rst:36: ERROR: Malformed table'

037cb2b... by Christian Kamm <email address hidden>

Placeholder: Stop adding ignore pattern

Because we can't make older clients preserve the version directive that
was attached to it.

See #6504 and #6498

91f085c... by Christian Kamm <email address hidden>

Placeholder: Don't contain "stub"

312143d... by Christian Kamm <email address hidden>

Placeholders: Save to key that's invisible to <2.5 clients #6504

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

FolderWizard: fix crash when experimental feature are disabled

The _placeholderCheckBox only exists if the experimental features are enabled

Found via the crash reporter
https://sentry.io/owncloud/desktop-win-and-mac/issues/556407777/

05c5ede... by Christian Kamm <email address hidden>

CMake: Add a default placeholder_suffix

To make themes work that don't define it explicitly.

0477178... by Markus Goetz <email address hidden>

Placeholders: Support for macOS #6290