Merge lp://qastaging/~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump into lp://qastaging/ubuntu-weather-app
Proposed by
Andrew Hayzen
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Victor Thompson | ||||
Approved revision: | 166 | ||||
Merged at revision: | 180 | ||||
Proposed branch: | lp://qastaging/~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump | ||||
Merge into: | lp://qastaging/ubuntu-weather-app | ||||
Diff against target: |
776 lines (+93/-67) 42 files modified
app/components/CurrentLocation.qml (+1/-1) app/components/DayDelegate.qml (+1/-1) app/components/DayDelegateExtraInfo.qml (+1/-1) app/components/ExpandableListItem.qml (+1/-1) app/components/FakeHeader.qml (+4/-4) app/components/FastScroll.qml (+1/-1) app/components/ForecastDetailsDelegate.qml (+1/-1) app/components/HeaderRow.qml (+1/-1) app/components/HomeGraphic.qml (+1/-1) app/components/HomeHourly.qml (+1/-1) app/components/HomePageEmptyStateComponent.qml (+1/-1) app/components/HomeTempInfo.qml (+1/-1) app/components/ListItemActions/CheckBox.qml (+1/-1) app/components/ListItemActions/Remove.qml (+1/-1) app/components/ListItemReorderComponent.qml (+1/-1) app/components/ListItemWithActions.qml (+1/-1) app/components/LoadingIndicator.qml (+1/-1) app/components/LocationsPageEmptyStateComponent.qml (+1/-1) app/components/MultiSelectHeadState.qml (+1/-1) app/components/MultiSelectListView.qml (+1/-1) app/components/NetworkErrorStateComponent.qml (+1/-1) app/components/NoAPIKeyErrorStateComponent.qml (+1/-1) app/components/PageWithBottomEdge.qml (+21/-10) app/components/SettingsButton.qml (+1/-1) app/components/StandardListItem.qml (+1/-1) app/components/WeatherListItem.qml (+1/-1) app/components/WeatherListView.qml (+1/-1) app/ubuntu-weather-app.qml (+1/-1) app/ui/AddLocationPage.qml (+8/-6) app/ui/HomePage.qml (+7/-1) app/ui/LocationPane.qml (+1/-1) app/ui/LocationsPage.qml (+2/-2) app/ui/SettingsPage.qml (+1/-1) app/ui/settings/DataProviderPage.qml (+1/-1) app/ui/settings/LocationPage.qml (+1/-1) app/ui/settings/RefreshIntervalPage.qml (+1/-1) app/ui/settings/UnitsPage.qml (+1/-1) debian/changelog (+1/-0) manifest.json.in (+1/-1) po/com.ubuntu.weather.pot (+6/-6) tests/autopilot/ubuntu_weather_app/__init__.py (+10/-5) ubuntu-weather-app.desktop.in.in (+1/-0) |
||||
To merge this branch: | bzr merge lp://qastaging/~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Victor Thompson | Approve | ||
Jenkins Bot | continuous-integration | Approve | |
Bartosz Kosiorek (community) | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Andrew Hayzen | Abstain | ||
Review via email:
|
Commit message
* Update app to use the Ubuntu Components version 1.3
Description of the change
* Update app to use the Ubuntu Components version 1.3
I think I've managed to tweak the FakeHeader and PageWithBottomEdge to match the new header height and styling requirements :-)
Please test AP locally as well.
To post a comment you must log in.
FAILED: Continuous integration, rev:154 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- ci/289/ 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- vivid-amd64- ci/289/ console
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- ci/289/ rebuild
http://