GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

The spacing between the wifi and airplane mode checkboxes does not match
the spacing between the airplane mode checkboxes and the search field.

When the checkboxes are not present the search field has a large,
asymmetric left padding

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This follows the upstream naming of openconnect and is less confusing when
there is also now support for pulse.

openconnect supports it since version 8.04

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Fix password entry jumping to different networks with wifi scanning, by pausing the scan when appropriate

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This reverts commit 45f7eae4

On mobile we are not using modem manager but ofono plugin to manage the
mobiles, that is why this KCM can not work there. Besides this KCM is
mostly placeholder and is causing more confusion then function, let's
remove it.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Qt 5.15 introduced new syntax for defining Connections. Fix warnings like this one:
QML Connections: Implicitly defined onFoo properties in Connections are deprecated. Use this syntax instead: function onFoo(<arguments>) { ... }

Right now the search field is only visible when specifically activated
by clicking on the search button. This was done because there used to be
a ton of buttons on the toolbar row that made the search field's size
and position look odd when sharing the same row. However with other
recent changes, we no longer have this constraint and there is now
plenty of room for the search field even including some generous
padding to separate it from other controls. So let's put it there.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

- Make custom configure button only appear when not in the system tray
- Change icon of configure button to follow the standard

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

We initialise both byte amounts to 0 and onCompleted can run earlier than
the first update of the model.

This adds support for the OpenVPN parameter compress. With this, it is
possible to use compression algorithms like lz4 or lz4-v2.

BUG: 387715

Accept hints, display the input fields and set the label accordingly, update secrets so that the 2fa secret can be used

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"