Ubuntu Music App

Merge lp:~vthompson/music-app/remix-bump-version into lp:music-app/remix

  1. remix-bump-version
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 722
Merged at revision: 722
Proposed branch: lp:~vthompson/music-app/remix-bump-version
Merge into: lp:music-app/remix
Diff against target: 118 lines (+86/-3)
3 files modified
click/manifest.json.in (+1/-1)
debian/changelog (+84/-1)
music-app.qml (+1/-1)
To merge this branch: bzr merge lp:~vthompson/music-app/remix-bump-version
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Review via email: mp+239976@code.launchpad.net

Commit message

Bump version to 2.0 and add to changelog

Description of the change

Bump version to 2.0 and add to changelog. Changelog is taken from the list provided with each informal click update.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:722
http://91.189.93.70:8080/job/music-app-remix-ci/217/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1385
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1385/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/217

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/217/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM :)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'click/manifest.json.in'
--- click/manifest.json.in 2014-09-08 08:08:13 +0000
+++ click/manifest.json.in 2014-10-29 12:06:33 +0000
@@ -14,7 +14,7 @@
14 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",14 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
15 "name": "@PROJECT_NAME@",15 "name": "@PROJECT_NAME@",
16 "title": "Music",16 "title": "Music",
17 "version": "1.3.@BZR_REVNO@",17 "version": "2.0.@BZR_REVNO@",
18 "x-source": {18 "x-source": {
19 "vcs-bzr": "@BZR_SOURCE@",19 "vcs-bzr": "@BZR_SOURCE@",
20 "vcs-bzr-revno": "@BZR_REVNO@"20 "vcs-bzr-revno": "@BZR_REVNO@"
2121
=== modified file 'debian/changelog'
--- debian/changelog 2014-03-10 21:52:45 +0000
+++ debian/changelog 2014-10-29 12:06:33 +0000
@@ -1,4 +1,87 @@
1music-app (1.2ubuntu2) UNRELEASED; urgency=medium1music-app (2.0) utopic; urgency=medium
2
3 * Fix for cover art getting out of sync on the SongsPage.qml
4 * Ensure recent/playlists pages remain in sync as items are added/removed from the playlist.
5 * Update ListItemWithActions background color and reenable dim
6 * Optimise the addQueueList transaction.
7 * Sort playlists by name.
8 * Change scrolling behaviour
9 * Performance tweaks to ListItemWithActions.qml.
10 * Change recent schemas so that it stores less and loads more from ms2 (eg art).
11 * Fix for console errors when clearing the queue.
12 * Only load model once CardView is visible.
13 * Create generic WorkerModelLoader.qml
14 * Load queue at startup via WorkerScript.
15 * Intial changes to remember the previous queue when restarting the app.
16 * Load queueList in async
17 * Fix to prevent jumping from queue->full view
18 * Defer loading of pages
19 * Async load MediaPlayer object.
20 * Correctly hide empty state when in Now Playing or Queue.
21 * Async loading of MusicNowPlaying.
22 * Add read path to Music on the SD card to extract in process thumbnail extraction.
23 * Highlight stroke buttons on press.
24 * Optimise MusicRow.qml by using Image rather than CoverGrid (as there will only ever be one image).
25 * Add a bottom margin to MusicTracks.qml and MusicNowPlaying.qml.
26 * Fix playlist art in Now Playing page.
27 * Add save to playlist action
28 * Only enable actions in now playing when trackQueue count > 0
29 * Use async for loaders and unused loaders invisible.
30 * Move to using Qt.labs.settings and remove settings.js.
31 * Remove CoverRow
32 * Remove isPressedChanged workaround
33 * Remove MusicRow isSquare specialization.
34 * Remove lastfm, search and settings.
35 * Pull upstream ListItemWithActions.qml
36 * Add support for multiselect mode
37 * Disable triggerOnRelease.
38 * Initial empty state prototype.
39 * Do not show the artist in the grid of albums.
40 * Fix so that label is correct when seeking when paused.
41 * Only show year in SongsPage.qml if year exists.
42 * Add an initial Genres tab.
43 * Disable clear recent icon when recent is empty.
44 * Make Images asynchronous.
45 * Add back apparmor confinement.
46 * Use CardView in Recent Tab
47 * Use Recent as default if >0 recent items otherwise use Albums Tab.
48 * Set sourceSize of images.
49 * Force AlbumsPage's SongsModel to filter upon startup.
50 * Fix playlist deletion and renaming in recent table.
51 * Add support for CardView in AlbumsPage.qml
52 * Add support for header property in CardView.qml
53 * Add BlurredHeader.qml
54 * Make AlbumsPage.qml and SongsPage.qml use BlurredHeader.qml.
55 * Allow for imports (from content-hub) to start when already importing.
56 * Use CardView in MusicPlaylists.qml
57 * Use header actions for edit and delete of playlists.
58 * Make SongsPage use CoverGrid.
59 * Add CoverGrid.qml component
60 * Use CoverGrid in Card.qml
61 * Initial Artists view with CardView.
62 * Add clear queue action. Fixes: https://bugs.launchpad.net/bugs/1379895.
63 * Switch to use positionAt when isListView becomes true
64 * Strip out jumpTo/ensureVisible code for the now playing queue
65 * Fix for console errors when pressing items in queue.
66 * Remove deleted item before updating currentIndex.
67 * Initial Now Playing queue list refactor
68 * Initial Songs tab redesign for remix.
69 * Ignore first value back after seeking [Workaround]. Fixes: bug 1310706.
70 * Do not switch to full view if clicking a song in the queue.
71 * Fix Ubuntu-Splash-Color to not get pulled into translations.
72 * Albums tab makes use of 'CardView'
73 * Old toolbars removed
74 * Now playing "full" view is now default
75 * Fix header disappearing in "full" view
76 * Fix for cover art in albums tab to use correct data
77 * SongsPage implemented
78 * Now Playing "full" view implemented (other than swiping and margins need review)
79 * Toolbar implemented and always shown (Now Playing "list" view shows old toolbar)
80 * Background colour of app set
81
82 -- Victor Thompson <victor.thompson@gmail.com> Wed, 29 Oct 2014 06:41:45 -0500
83
84music-app (1.2ubuntu2) trusty; urgency=medium
285
3 [ Andrew Hayzen ]86 [ Andrew Hayzen ]
4 * Refactor media player to make it easier to change shuffle/repeat87 * Refactor media player to make it easier to change shuffle/repeat
588
=== modified file 'music-app.qml'
--- music-app.qml 2014-10-29 02:44:47 +0000
+++ music-app.qml 2014-10-29 12:06:33 +0000
@@ -580,7 +580,7 @@
580580
581 // VARIABLES581 // VARIABLES
582 property string musicName: i18n.tr("Music")582 property string musicName: i18n.tr("Music")
583 property string appVersion: '1.2'583 property string appVersion: '2.0'
584 property bool toolbarShown: musicToolbar.visible584 property bool toolbarShown: musicToolbar.visible
585 property bool selectedAlbum: false585 property bool selectedAlbum: false
586 property alias queueIndex: startupSettings.queueIndex586 property alias queueIndex: startupSettings.queueIndex

Subscribers

People subscribed via source and target branches