Merge lp:~ken-vandine/ubuntu-system-settings/lp1668640 into lp:ubuntu-system-settings

Proposed by Ken VanDine on 2017-03-21
Status: Merged
Approved by: Jonas G. Drange on 2017-03-22
Approved revision: 1765
Merged at revision: 1771
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/lp1668640
Merge into: lp:ubuntu-system-settings
Diff against target: 28 lines (+3/-2)
1 file modified
plugins/time-date/ChooseTimeZone.qml (+3/-2)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/lp1668640
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve on 2017-03-22
Jonas G. Drange (community) 2017-03-21 Approve on 2017-03-22
Review via email: mp+320533@code.launchpad.net

Commit message

[time-date] Fixed some issues from the APL migration

Description of the change

[time-date] Fixed some issues from the APL migration

To post a comment you must log in.

PASSED: Continuous integration, rev:1784
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/15/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2332
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2331
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2153
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2153/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2153
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2153/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2153
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2153/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2153
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2153/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2153
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2153/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2153
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2153/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
1765. By Ken VanDine on 2017-03-22

[time-date] Fixed some issues from the APL migration

Jonas G. Drange (jonas-drange) wrote :

Thanks. Sorry that slipped through.

review: Approve

PASSED: Continuous integration, rev:1785
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/16/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2335
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2334
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2156
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2156/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2156
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2156/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2156
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2156/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2156
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2156/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2156
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2156/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2156
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2156/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/time-date/ChooseTimeZone.qml'
2--- plugins/time-date/ChooseTimeZone.qml 2016-12-02 15:32:35 +0000
3+++ plugins/time-date/ChooseTimeZone.qml 2017-03-22 12:07:55 +0000
4@@ -26,13 +26,14 @@
5 import Ubuntu.SystemSettings.TimeDate 1.1
6
7 ItemPage {
8+ id: changeTimeZonePage
9 title: i18n.tr("Time zone")
10 flickable: locationsListView
11 property UbuntuTimeDatePanel timeDatePanel
12
13 Timer {
14 id: goBackTimer
15- onTriggered: pageStack.pop()
16+ onTriggered: removePages(changeTimeZonePage)
17 }
18
19 Connections {
20@@ -62,7 +63,7 @@
21
22 TextField {
23 anchors {
24- top: showAllUI ? setTimeZoneSelector.bottom : parent.top
25+ top: showAllUI ? setTimeZoneSelector.bottom : header.bottom
26 left: parent.left
27 right: parent.right
28 margins: units.gu(2)

Subscribers

People subscribed via source and target branches