- 25 Sep, 2017 1 commit
-
-
Martin Kacej authored
-
- 23 Sep, 2017 1 commit
-
-
Martin Kacej authored
-
- 19 Sep, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 18 Sep, 2017 3 commits
-
-
Jan Grulich authored
-
Jan Grulich authored
-
Jan Grulich authored
-
- 16 Sep, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 15 Sep, 2017 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
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"
-
- 14 Sep, 2017 2 commits
-
-
Jonathan Riddell authored
GIT_SILENT
-
David Edmundson authored
Test Plan: Tested with orca Reviewers: #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D7800
-
- 13 Sep, 2017 1 commit
-
-
Jonathan Riddell authored
GIT_SILENT
-
- 09 Sep, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 06 Sep, 2017 1 commit
-
-
Jan Grulich authored
It has been replaced by the new KCM module in Plasma 5.9 and it is just basically redundant
-
- 03 Sep, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 31 Aug, 2017 1 commit
-
-
Jan Grulich authored
If this option is enabled, users will see virtual connections in applet and in the connection editor and they will be able to create new virtual connections as well. This option is disabled by default as we don't want regular users to be bothered by this. BUG:376664
-
- 28 Aug, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 16 Aug, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 30 Jul, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 26 Jul, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 14 Jul, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 12 Jul, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 10 Jul, 2017 1 commit
-
-
Andrea Scarpino authored
Test Plan: built and tested Reviewers: jgrulich Reviewed By: jgrulich Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D6520
-
- 03 Jul, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 30 Jun, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 29 Jun, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 27 Jun, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 26 Jun, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 25 Jun, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 23 Jun, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 21 Jun, 2017 1 commit
-
-
Jan Grulich authored
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
-
- 13 Jun, 2017 1 commit
-
-
Script Kiddy authored
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"
-
- 09 Jun, 2017 2 commits
-
-
Jan Grulich authored
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
-
Jan Grulich authored
-
- 01 Jun, 2017 6 commits
-
-
Jan Grulich authored
-
Jan Grulich authored
This one will not change and NM will allow to connect to it BUG:380379
-
Jan Grulich authored
BUG:380399
-
Jan Grulich authored
BUG:380399
-
Jan Grulich authored
BUG:380299
-
Jan Grulich authored
BUG:380299
-