ubuntu-system-settings

Merge lp://qastaging/~jonas-drange/ubuntu-system-settings/filepicker into lp://qastaging/ubuntu-system-settings

  1. filepicker
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Superseded
Proposed branch: lp://qastaging/~jonas-drange/ubuntu-system-settings/filepicker
Merge into: lp://qastaging/ubuntu-system-settings
Diff against target: 497 lines (+101/-151)
9 files modified
debian/control (+3/-3)
plugins/wifi/CMakeLists.txt (+0/-1)
plugins/wifi/CertDialog.qml (+37/-10)
plugins/wifi/CertPicker.qml (+0/-58)
plugins/wifi/OtherNetwork.qml (+34/-12)
plugins/wifi/certhandler.cpp (+24/-22)
plugins/wifi/certhandler.h (+3/-4)
tests/autopilot/ubuntu_system_settings/__init__.py (+0/-32)
tests/autopilot/ubuntu_system_settings/tests/test_vpn.py (+0/-9)
To merge this branch: bzr merge lp://qastaging/~jonas-drange/ubuntu-system-settings/filepicker
Reviewer Review Type Date Requested Status
Ken VanDine Approve
system-apps-ci-bot continuous-integration Needs Fixing
Review via email: mp+301248@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2016-10-14.

Commit message

use the vpn filepicker, and make the cert handling more robust

Description of the change

This change is a prerequisite for the upcoming WAPI landing. It retires the old content hub file picker, and uses the one from USC (same one used for VPN).

It also introduces some bits in the Wi-Fi panel that we will need for supporting WAPI.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1674
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/54/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1044/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1044
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/941
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/941
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/941
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/932/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/932/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/932/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/932/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/932/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/932/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/932/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/932/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/932/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/54/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve
lp://qastaging/~jonas-drange/ubuntu-system-settings/filepicker updated
1675. By Jonas G. Drange

sync trunk

1676. By Jonas G. Drange

merge prereq

1677. By Jonas G. Drange

syncs with trunk

1678. By Jonas G. Drange

syncs with trunk

1679. By Jonas G. Drange

adds test dep on newer usc

1680. By Jonas G. Drange

adds mock folder list model, used implicitly by otherNetwork

1681. By Jonas G. Drange

selects cert in selector when selected from disk (\!)

Unmerged revisions

1681. By Jonas G. Drange

selects cert in selector when selected from disk (\!)

1680. By Jonas G. Drange

adds mock folder list model, used implicitly by otherNetwork

1679. By Jonas G. Drange

adds test dep on newer usc

1678. By Jonas G. Drange

syncs with trunk

1677. By Jonas G. Drange

syncs with trunk

1676. By Jonas G. Drange

merge prereq

1675. By Jonas G. Drange

sync trunk

1674. By Jonas G. Drange

use filepicker from USC, implement some wapi bits that will be needed down the line

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches