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"

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"

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"

Summary:
This adds support for Fortigate SSL VPN which has been added recently to NM [1]. There is also a
bug 355079 opened for missing support.

[1] - https://blogs.gnome.org/lkundrak/2015/09/24/fortigate-ssl-vpn-support-added-to-networkmanager/

Reviewers: lvsouza, mbriza

Reviewed By: mbriza

Subscribers: mbriza, christiangonzalez, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D6189

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"

Summary:
Could the plasma-nm/vpn/l2tp/ source be updated to support IPsec changes introduced with NetworkManager-l2tp version 1.2.6.

A screen shot of the current GNOME IPsec UI can be viewed here:
[[ https://github.com/nm-l2tp/network-manager-l2tp/wiki/Screenshots#ipsec-options | https://github.com/nm-l2tp/network-manager-l2tp/wiki/Screenshots#ipsec-options ]]

A summary of the changes for NetworkManager-l2tp 1.2.6 include:

Added the following to IPsec UI:
  - Phase 1 algorithms
  - Phase 2 algorithms
  - Enforce UDP encapsulation

Removed the following from IPsec UI:
  - Group Name

Copied nm-l2tp-service.h from NetworkManager-l2tp 1.2.6

Phase 1 & 2 algorithms UI additions are compatible with NetworkManager-l2tp versions 1.2.6 and 1.0.6 (from the 1.0.x series which has the changes backported from 1.2.6)

Reviewers: jgrulich

Reviewed By: jgrulich

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D6111

This one will not change and NM will allow to connect to it

BUG:380379

BUG:380399

BUG:380399

BUG:380299

BUG:380299

BUG:380244

BUG:380244

GIT_SILENT

BUG:380150

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"

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"

REVIEW: 130109
BUG: 379279
FIXED-IN: 5.9.6

This has been deprecated since NM 0.9.10.

BUG:379400

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"

Summary:
Improve UI of all paswords dialogs. Previously we had two methods to setup UI
of the dialog, either for VPN or for regular connections like WiFi. I merged
them into one and both are now based on same UI, except that VPN connections
insert their specific widget into the dialog, while regular connections use
only one password field.

Screenshots of old password dialogs:
{F3611476}

{F3611479}

Screenshots of new password dialogs:
{F3611478}

{F3611477}

Reviewers: #vdg, #plasma, mart

Reviewed By: mart

Subscribers: lukas, fabianr, mart, broulik, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D5382

In case of creating a new openvpn connection we might want to configure
advanced options, confirm it and later if we open it again we would end
up with an empty dialog, because we expected configuration to be initialized.

BUG:378648