Merge lp:~twstd-dev/ubuntu-clock-app/1354617 into lp:ubuntu-clock-app

Proposed by twstd
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 44
Merged at revision: 44
Proposed branch: lp:~twstd-dev/ubuntu-clock-app/1354617
Merge into: lp:ubuntu-clock-app
Diff against target: 25 lines (+2/-2)
2 files modified
app/alarm/AlarmList.qml (+1/-1)
app/worldclock/UserWorldCityList.qml (+1/-1)
To merge this branch: bzr merge lp:~twstd-dev/ubuntu-clock-app/1354617
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Nekhelesh Ramananthan Approve
Review via email: mp+230206@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

lgtm! Nice work.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~twstd-dev/ubuntu-clock-app/1354617/+merge/230206/+edit-commit-message

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/alarm/AlarmList.qml'
2--- app/alarm/AlarmList.qml 2014-08-07 13:17:02 +0000
3+++ app/alarm/AlarmList.qml 2014-08-09 14:41:56 +0000
4@@ -136,7 +136,7 @@
5 UbuntuNumberAnimation {
6 target: alarmDelegate
7 property: "height"
8- to: 1
9+ to: 0
10 }
11
12 PropertyAction {
13
14=== modified file 'app/worldclock/UserWorldCityList.qml'
15--- app/worldclock/UserWorldCityList.qml 2014-08-06 20:00:22 +0000
16+++ app/worldclock/UserWorldCityList.qml 2014-08-09 14:41:56 +0000
17@@ -127,7 +127,7 @@
18 UbuntuNumberAnimation {
19 target: userWorldCityDelegate
20 property: "height"
21- to: 1
22+ to: 0
23 }
24
25 PropertyAction {

Subscribers

People subscribed via source and target branches

to all changes: