Merge lp://qastaging/~ahayzen/music-app/refactor-pull-now-playing-sidebar into lp://qastaging/music-app
Proposed by
Andrew Hayzen
Status: | Rejected | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Rejected by: | Andrew Hayzen | ||||||||||||
Proposed branch: | lp://qastaging/~ahayzen/music-app/refactor-pull-now-playing-sidebar | ||||||||||||
Merge into: | lp://qastaging/music-app | ||||||||||||
Diff against target: |
385 lines (+152/-11) 15 files modified
app/components/MusicPage.qml (+45/-4) app/components/NowPlayingSidebar.qml (+60/-0) app/components/NowPlayingToolbar.qml (+2/-0) app/components/Queue.qml (+4/-2) app/music-app.qml (+29/-3) app/ui/AddToPlaylist.qml (+1/-0) app/ui/Albums.qml (+1/-0) app/ui/ArtistView.qml (+1/-0) app/ui/Artists.qml (+1/-0) app/ui/Genres.qml (+1/-0) app/ui/Playlists.qml (+1/-0) app/ui/Recent.qml (+1/-0) app/ui/Songs.qml (+1/-0) app/ui/SongsView.qml (+3/-2) debian/changelog (+1/-0) |
||||||||||||
To merge this branch: | bzr merge lp://qastaging/~ahayzen/music-app/refactor-pull-now-playing-sidebar | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Andrew Hayzen | Needs Information | ||
Review via email: mp+253839@code.qastaging.launchpad.net |
Commit message
* Make NowPlaying into a conditional sidebar
Description of the change
* Make NowPlaying into a conditional sidebar
Pull of lp:~music-app-dev/music-app/refactor-now-playing-as-sidebar into lp:music-app/refactor with conflicts resolved :)
To post a comment you must log in.
Unmerged revisions
- 856. By Andrew Hayzen
-
* Remove unused orientation sensor
- 855. By Andrew Hayzen
-
* Merge of trunk
- 854. By Andrew Hayzen
- 853. By Andrew Hayzen
-
* Add changelog
- 852. By Andrew Hayzen
-
* Merge of lp:music-app/refactor
- 851. By Andrew Hayzen
-
* Fix uses of header instead of blurredHeader
- 850. By Andrew Hayzen
-
* Merge of lp:music-app/refactor
- 849. By Andrew Hayzen
-
* Fix bad merge conflict
- 848. By Andrew Hayzen
-
* Reverse cherry pick lp:~ahayzen/music-app/async-loader-pages out of this branch
- 847. By Andrew Hayzen
-
* Make NowPlaying into a conditional sidebar
Note this pulls in lp:~ahayzen/music-app/async-loader-pages as well.