Merge lp:~einstein21/podbird/increaseVersionNumber into lp:podbird

Proposed by stefanweng
Status: Merged
Merged at revision: 191
Proposed branch: lp:~einstein21/podbird/increaseVersionNumber
Merge into: lp:podbird
Diff against target: 38 lines (+5/-4)
3 files modified
app/ui/EpisodesTab.qml (+4/-2)
clickable.json (+0/-1)
manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~einstein21/podbird/increaseVersionNumber
Reviewer Review Type Date Requested Status
Michael Sheldon Approve
Review via email: mp+365095@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/ui/EpisodesTab.qml'
--- app/ui/EpisodesTab.qml 2017-01-03 00:02:16 +0000
+++ app/ui/EpisodesTab.qml 2019-03-26 10:47:58 +0000
@@ -746,8 +746,10 @@
746 } else {746 } else {
747 episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited, "diff": "Older"})747 episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited, "diff": "Older"})
748 }748 }
749 } else if (diff >= 7){749 } else if (diff >= 7) {
750 break750 if (episode.downloadedfile != null) {
751 episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited, "diff": "Older"})
752 }
751 }753 }
752 }754 }
753755
754756
=== modified file 'clickable.json'
--- clickable.json 2018-08-17 15:19:43 +0000
+++ clickable.json 2019-03-26 10:47:58 +0000
@@ -1,4 +1,3 @@
1{1{
2 "sdk": "ubuntu-sdk-16.04",
3 "template": "cmake"2 "template": "cmake"
4}3}
54
=== modified file 'manifest.json.in'
--- manifest.json.in 2018-08-17 15:20:48 +0000
+++ manifest.json.in 2019-03-26 10:47:58 +0000
@@ -9,7 +9,7 @@
9 "desktop": "Podbird.desktop"9 "desktop": "Podbird.desktop"
10 }10 }
11 },11 },
12 "version": "0.8.1",12 "version": "0.8.2",
13 "maintainer": "Michael Sheldon <mike@mikeasoft.com>",13 "maintainer": "Michael Sheldon <mike@mikeasoft.com>",
14 "framework": "ubuntu-sdk-16.04"14 "framework": "ubuntu-sdk-16.04"
15}15}

Subscribers

People subscribed via source and target branches

to status/vote changes: