Merge lp://staging/~jonas-drange/ubuntu-system-settings/filepicker into lp://staging/ubuntu-system-settings
Status: | Approved |
---|---|
Approved by: | Ken VanDine |
Approved revision: | 1681 |
Proposed branch: | lp://staging/~jonas-drange/ubuntu-system-settings/filepicker |
Merge into: | lp://staging/ubuntu-system-settings |
Prerequisite: | lp://staging/~timo-jyrinki/ubuntu-system-settings/stop_depending_on_transitional_packages |
Diff against target: |
1077 lines (+619/-151) 18 files modified
debian/control (+2/-2) plugins/wifi/CMakeLists.txt (+0/-1) plugins/wifi/CertDialog.qml (+39/-10) plugins/wifi/CertPicker.qml (+0/-58) plugins/wifi/OtherNetwork.qml (+57/-13) 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) tests/mocks/CMakeLists.txt (+1/-0) tests/mocks/Qt/CMakeLists.txt (+1/-0) tests/mocks/Qt/labs/CMakeLists.txt (+1/-0) tests/mocks/Qt/labs/folderlistmodel/CMakeLists.txt (+20/-0) tests/mocks/Qt/labs/folderlistmodel/MockFolderListModel.cpp (+241/-0) tests/mocks/Qt/labs/folderlistmodel/MockFolderListModel.h (+171/-0) tests/mocks/Qt/labs/folderlistmodel/plugin.cpp (+26/-0) tests/mocks/Qt/labs/folderlistmodel/plugin.h (+31/-0) tests/mocks/Qt/labs/folderlistmodel/qmldir (+2/-0) |
To merge this branch: | bzr merge lp://staging/~jonas-drange/ubuntu-system-settings/filepicker |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
system-apps-ci-bot | continuous-integration | Needs Fixing | |
Review via email: mp+308520@code.staging.launchpad.net |
This proposal supersedes a proposal from 2016-07-27.
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.
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
FAILED: Continuous integration, rev:1674 /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/54/ /jenkins. canonical. com/system- apps/job/ build/1044/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/1044 /jenkins. canonical. com/system- apps/job/ build-1- sourcepkg/ release= vivid+overlay/ 941 /jenkins. canonical. com/system- apps/job/ build-1- sourcepkg/ release= xenial+ overlay/ 941 /jenkins. canonical. com/system- apps/job/ build-1- sourcepkg/ release= yakkety/ 941 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 932/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 932/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 932/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 932/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 932/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 932/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 932/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 932/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= yakkety/ 932/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/54/rebuild
https:/