Merge lp:~vthompson/ubuntu-weather-app/fix-1490040 into lp:ubuntu-weather-app

Proposed by Victor Thompson on 2015-09-19
Status: Merged
Approved by: Andrew Hayzen on 2015-10-18
Approved revision: 127
Merged at revision: 142
Proposed branch: lp:~vthompson/ubuntu-weather-app/fix-1490040
Merge into: lp:ubuntu-weather-app
Diff against target: 26 lines (+5/-0)
2 files modified
app/ui/LocationsPage.qml (+4/-0)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/fix-1490040
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-10-18
Andrew Hayzen 2015-09-19 Approve on 2015-10-18
Review via email: mp+271741@code.launchpad.net

Commit message

* Show the bottom loading animation (LoadingIndicator) on the LocationsPage.

Description of the change

* Show the bottom loading animation (LoadingIndicator) on the LocationsPage.

To post a comment you must log in.
127. By Victor Thompson on 2015-10-18

Merge of trunk and resolve conflicts

Andrew Hayzen (ahayzen) wrote :

LGTM :-)

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml 2015-09-10 23:43:49 +0000
+++ app/ui/LocationsPage.qml 2015-10-18 15:18:24 +0000
@@ -258,6 +258,10 @@
258 }258 }
259 }259 }
260260
261 LoadingIndicator {
262 id: loadingIndicator
263 }
264
261 Loader {265 Loader {
262 active: locationsList === null || locationsList.length === 0266 active: locationsList === null || locationsList.length === 0
263 anchors {267 anchors {
264268
=== modified file 'debian/changelog'
--- debian/changelog 2015-10-16 00:12:57 +0000
+++ debian/changelog 2015-10-18 15:18:24 +0000
@@ -28,6 +28,7 @@
28 * Make sure the text elides on the LocationsPage and the AddLocationPage. (LP: #1469460)28 * Make sure the text elides on the LocationsPage and the AddLocationPage. (LP: #1469460)
29 * Make the first column of the day delegate extra info wider to accommodate other29 * Make the first column of the day delegate extra info wider to accommodate other
30 languages.30 languages.
31 * Show the bottom loading animation (LoadingIndicator) on the LocationsPage. (LP: #1490040)
3132
32 [ Andrew Hayzen ]33 [ Andrew Hayzen ]
33 * Add mocked locations for autopilot and add a test using the data34 * Add mocked locations for autopilot and add a test using the data

Subscribers

People subscribed via source and target branches

to all changes: