lp:~unity-api-team/indicator-network/vpn-support

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:indicator-network/15.10 at revision 530

Marcus Tomlinson (community): Approve on 2015-10-05

Diff: 2947 lines (+1957/-144)

44 files modified

debian/control (+1/-1)
po/indicator-network.pot (+9/-5)
src/indicator/CMakeLists.txt (+7/-1)
src/indicator/factory.cpp (+30/-1)
src/indicator/factory.h (+4/-1)
src/indicator/indicator-menu.cpp (+2/-2)
src/indicator/indicator-menu.h (+1/-1)
src/indicator/menu-builder.cpp (+7/-0)
src/indicator/menuitems/access-point-item.cpp (+8/-7)
src/indicator/menuitems/modem-info-item.cpp (+13/-13)
src/indicator/menuitems/switch-item.cpp (+5/-4)
src/indicator/menuitems/switch-item.h (+2/-1)
src/indicator/menuitems/text-item.cpp (+7/-5)
src/indicator/menuitems/text-item.h (+5/-4)
src/indicator/menuitems/vpn-item.cpp (+62/-0)
src/indicator/menuitems/vpn-item.h (+38/-0)
src/indicator/menuitems/wifi-link-item.cpp (+5/-13)
src/indicator/nmofono/connection/active-connection-manager.cpp (+114/-0)
src/indicator/nmofono/connection/active-connection-manager.h (+53/-0)
src/indicator/nmofono/connection/active-connection.cpp (+144/-0)
src/indicator/nmofono/connection/active-connection.h (+74/-0)
src/indicator/nmofono/vpn/vpn-connection.cpp (+307/-0)
src/indicator/nmofono/vpn/vpn-connection.h (+89/-0)
src/indicator/nmofono/vpn/vpn-manager.cpp (+181/-0)
src/indicator/nmofono/vpn/vpn-manager.h (+53/-0)
src/indicator/sections/vpn-section.cpp (+173/-0)
src/indicator/sections/vpn-section.h (+40/-0)
src/menumodel-cpp/action-group-exporter.cpp (+1/-1)
src/menumodel-cpp/action-group-merger.cpp (+2/-1)
src/menumodel-cpp/action-group-merger.h (+1/-1)
src/menumodel-cpp/action.cpp (+4/-4)
src/menumodel-cpp/action.h (+3/-3)
src/menumodel-cpp/menu-item.cpp (+46/-23)
src/menumodel-cpp/menu-item.h (+26/-21)
tests/integration/CMakeLists.txt (+1/-0)
tests/integration/indicator-network-test-base.cpp (+139/-10)
tests/integration/indicator-network-test-base.h (+18/-1)
tests/integration/test-indicator-vpn.cpp (+220/-0)
tests/integration/test-indicator.cpp (+18/-0)
tests/menuharness/MenuItemMatcher.cpp (+29/-5)
tests/unit/indicator/menuitems/test-access-point-item.cpp (+1/-1)
tests/unit/indicator/menuitems/test-switch-item.cpp (+1/-1)
tests/utils/action-utils.cpp (+9/-9)
tests/utils/action-utils.h (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

530. By Pete Woods on 2015-10-06

Add basic VPN support

529. By Pete Woods on 2015-10-06

Fix icon method in menu harness

528. By Launchpad Translations on behalf of indicator-applet-developers on 2015-09-19

Launchpad automatic translations update.

527. By CI Train Bot Account on 2015-09-18

Resync trunk.

526. By CI Train Bot Account on 2015-09-16

Releasing 0.5.5+15.10.20150916-0ubuntu1

525. By Jonas G. Drange on 2015-09-16

Expose modemsAvailable. Bump version due to API change.
Approved by: PS Jenkins bot, Pete Woods

524. By CI Train Bot Account on 2015-09-10

Releasing 0.5.4+15.10.20150910-0ubuntu1

523. By Jonas G. Drange on 2015-09-10

Allow creation and configuration of insecure hotspot via the connectivity service. Bumped version due to new API. Fixes: #1431876
Approved by: PS Jenkins bot

522. By Launchpad Translations on behalf of indicator-applet-developers on 2015-09-09

Launchpad automatic translations update.

521. By Launchpad Translations on behalf of indicator-applet-developers on 2015-09-05

Launchpad automatic translations update.