Merge lp://qastaging/~jonas-drange/ubuntu-settings-components/vpn into lp://qastaging/~registry/ubuntu-settings-components/trunk
Proposed by
Jonas G. Drange
| Status: | Merged |
|---|---|
| Approved by: | Nick Dedekind |
| Approved revision: | 134 |
| Merged at revision: | 112 |
| Proposed branch: | lp://qastaging/~jonas-drange/ubuntu-settings-components/vpn |
| Merge into: | lp://qastaging/~registry/ubuntu-settings-components/trunk |
| Diff against target: |
3473 lines (+3263/-0) 39 files modified
debian/control (+1/-0) examples/VpnComponents.qml (+141/-0) plugins/Ubuntu/Settings/CMakeLists.txt (+1/-0) plugins/Ubuntu/Settings/Vpn/CMakeLists.txt (+23/-0) plugins/Ubuntu/Settings/Vpn/DialogFile.qml (+176/-0) plugins/Ubuntu/Settings/Vpn/DialogFileProperties.qml (+22/-0) plugins/Ubuntu/Settings/Vpn/FileSelector.qml (+94/-0) plugins/Ubuntu/Settings/Vpn/Openvpn/CMakeLists.txt (+3/-0) plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml (+426/-0) plugins/Ubuntu/Settings/Vpn/Openvpn/Preview.qml (+81/-0) plugins/Ubuntu/Settings/Vpn/Pptp/CMakeLists.txt (+3/-0) plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml (+379/-0) plugins/Ubuntu/Settings/Vpn/Pptp/Preview.qml (+61/-0) plugins/Ubuntu/Settings/Vpn/PreviewDialog/AllTrafficWithDns.qml (+47/-0) plugins/Ubuntu/Settings/Vpn/PreviewDialog/AllTrafficWithoutDns.qml (+53/-0) plugins/Ubuntu/Settings/Vpn/PreviewDialog/CMakeLists.txt (+3/-0) plugins/Ubuntu/Settings/Vpn/PreviewDialog/InvalidCert.qml (+69/-0) plugins/Ubuntu/Settings/Vpn/PreviewDialog/NoCert.qml (+35/-0) plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithRoutes.qml (+59/-0) plugins/Ubuntu/Settings/Vpn/PreviewDialog/NotInstalledWithoutRoutes.qml (+59/-0) plugins/Ubuntu/Settings/Vpn/PreviewDialog/SetUpUnused.qml (+56/-0) plugins/Ubuntu/Settings/Vpn/PreviewDialog/SomeTraffic.qml (+41/-0) plugins/Ubuntu/Settings/Vpn/VpnEditor.qml (+161/-0) plugins/Ubuntu/Settings/Vpn/VpnList.qml (+68/-0) plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml (+116/-0) plugins/Ubuntu/Settings/Vpn/VpnRoutesField.qml (+83/-0) plugins/Ubuntu/Settings/Vpn/VpnTypeField.qml (+54/-0) plugins/Ubuntu/Settings/Vpn/plugin.cpp (+36/-0) plugins/Ubuntu/Settings/Vpn/plugin.h (+30/-0) plugins/Ubuntu/Settings/Vpn/qmldir (+10/-0) plugins/Ubuntu/Settings/Vpn/ubuntusettingsvpn.cpp (+56/-0) plugins/Ubuntu/Settings/Vpn/ubuntusettingsvpn.h (+46/-0) tests/qmltests/CMakeLists.txt (+6/-0) tests/qmltests/Vpn/tst_VpnEditor.qml (+87/-0) tests/qmltests/Vpn/tst_VpnList.qml (+132/-0) tests/qmltests/Vpn/tst_VpnOpenvpnEditor.qml (+183/-0) tests/qmltests/Vpn/tst_VpnPptpEditor.qml (+145/-0) tests/qmltests/Vpn/tst_VpnPreviewDialog.qml (+142/-0) tests/qmltests/Vpn/tst_VpnPreviewDialogCertificateChecks.qml (+75/-0) |
| To merge this branch: | bzr merge lp://qastaging/~jonas-drange/ubuntu-settings-components/vpn |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Nick Dedekind (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Ubuntu Unity PS integration team | changed debian/control | Pending | |
|
Review via email:
|
|||
Commit message
New plugins Ubuntu.
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
None, but you need indicator-network >= 0.7.1
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes (silo 38)
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Added dep on qtquick layouts
* If you changed the UI, has there been a design review?
No changed UIs, only additions.
Instructions:
Run QML tests:
make testVpnEditor testVpnList testVpnOpenvpnE
Run example:
if nm-applet runs, kill it
start indicator-network && start indicator-
qmlscene examples/
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Nick Dedekind (nick-dedekind) wrote | # |
Revision history for this message
| Nick Dedekind (nick-dedekind) | # |
review:
Needs Fixing
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:120
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://