Merge lp://staging/~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration into lp://staging/ubuntu-weather-app
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration |
Merge into: | lp://staging/ubuntu-weather-app |
Prerequisite: | lp://staging/~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump |
Diff against target: |
1236 lines (+98/-948) 13 files modified
app/components/CMakeLists.txt (+0/-2) app/components/ListItemActions/CMakeLists.txt (+0/-5) app/components/ListItemActions/CheckBox.qml (+0/-25) app/components/ListItemActions/Remove.qml (+0/-27) app/components/ListItemReorderComponent.qml (+0/-106) app/components/ListItemWithActions.qml (+0/-496) app/components/MultiSelectHeadState.qml (+0/-72) app/components/MultiSelectListView.qml (+27/-8) app/components/WeatherListItem.qml (+0/-138) app/components/WeatherListView.qml (+1/-2) app/ui/LocationsPage.qml (+63/-48) debian/changelog (+4/-0) po/com.ubuntu.weather.pot (+3/-19) |
To merge this branch: | bzr merge lp://staging/~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jenkins Bot | continuous-integration | Approve | |
Andrew Hayzen | Pending | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Pending | |
Review via email: mp+278209@code.staging.launchpad.net |
This proposal supersedes a proposal from 2015-08-05.
Commit message
* Finish the migration to the new SDK list items
* Lock weather app in the Portrait orientation until we get some landscape designs
* Make the page with bottom edge animation less jarring when it reaches the top by adding a fake header (similar to what the clock app does)
Description of the change
* Finished the migration to the new SDK list items
* Locked weather app in the Portrait orientation until we get some landscape designs
* Made the page with bottom edge animation less jarring when it reaches the top by adding a fake header (similar to what the clock app does)
* Buy nik90 a beer for starting this effort
Unmerged revisions
- 82. By Victor Thompson
-
Merge trunk, resolve conflicts, and add changelog entry
- 81. By Victor Thompson
-
rebase on UC1.3 branch
- 80. By Victor Thompson
-
Merge of trunk
- 79. By Victor Thompson
-
Fix pot file
- 78. By Victor Thompson
-
Removed bad FakeHeader
- 77. By Victor Thompson
-
Merge of trunk and resolve conflicts.
- 76. By Victor Thompson
-
fix bad conflict resolution
- 75. By Victor Thompson
-
Merge and resolve conflicts.
- 74. By Victor Thompson
-
Merge of trunk
- 73. By Victor Thompson
-
Merge and resolve conflicts
The original MP is here, for reference for remaining issues: https:/ /code.launchpad .net/~nik90/ ubuntu- weather- app/finish- listitem- migration/ +merge/ 263136