OpenLP

Merge lp://qastaging/~phill-ridout/openlp/fixes-mkIV into lp://qastaging/openlp

  1. fixes-mkIV
  2. Merge into trunk
Proposed by Phill
Status: Merged
Merged at revision: 2794
Proposed branch: lp://qastaging/~phill-ridout/openlp/fixes-mkIV
Merge into: lp://qastaging/openlp
Diff against target: 390 lines (+96/-43)
12 files modified
openlp/core/api/deploy.py (+2/-0)
openlp/core/api/http/server.py (+4/-1)
openlp/core/app.py (+2/-2)
openlp/core/common/settings.py (+1/-1)
openlp/core/ui/media/mediacontroller.py (+3/-5)
openlp/core/ui/media/vlcplayer.py (+6/-5)
openlp/core/ui/servicemanager.py (+7/-3)
openlp/plugins/media/forms/mediaclipselectorform.py (+7/-6)
openlp/plugins/media/lib/mediaitem.py (+4/-5)
tests/functional/openlp_core/lib/test_exceptions.py (+45/-0)
tests/functional/openlp_core/lib/test_mediamanageritem.py (+9/-9)
tests/functional/openlp_core/ui/media/test_vlcplayer.py (+6/-6)
To merge this branch: bzr merge lp://qastaging/~phill-ridout/openlp/fixes-mkIV
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Raoul Snyman Approve
Review via email: mp+334708@code.qastaging.launchpad.net

Description of the change

A few various fixes, including some affecting the creation / saving of services.

Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~phill-ridout/openlp/fixes-mkIV (revision 2798)
https://ci.openlp.io/job/Branch-01-Pull/2337/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2238/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2108/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1434/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1253/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04c-Code_Analysis2/383/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/212/ [WAITING]
[RUNNING]
[FAILURE]
Stopping after failure

Failed builds:
 - Branch-05-AppVeyor-Tests #212: https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/212/console

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

see inline

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.