OpenLP

Merge lp://qastaging/~phill-ridout/openlp/import-depreciations into lp://qastaging/openlp

  1. import-depreciations
  2. Merge into trunk
Proposed by Phill
Status: Merged
Merged at revision: 2738
Proposed branch: lp://qastaging/~phill-ridout/openlp/import-depreciations
Merge into: lp://qastaging/openlp
Diff against target: 405 lines (+152/-68)
10 files modified
openlp/core/common/__init__.py (+45/-1)
openlp/core/lib/pluginmanager.py (+3/-28)
openlp/core/ui/media/mediacontroller.py (+6/-14)
openlp/plugins/presentations/lib/impresscontroller.py (+2/-1)
openlp/plugins/presentations/lib/pdfcontroller.py (+1/-1)
openlp/plugins/presentations/lib/powerpointcontroller.py (+1/-1)
openlp/plugins/presentations/lib/pptviewcontroller.py (+1/-1)
openlp/plugins/presentations/lib/presentationtab.py (+1/-1)
openlp/plugins/presentations/presentationplugin.py (+6/-15)
tests/functional/openlp_core_common/test_common.py (+86/-5)
To merge this branch: bzr merge lp://qastaging/~phill-ridout/openlp/import-depreciations
Reviewer Review Type Date Requested Status
Phill Approve
Tomas Groth Approve
Tim Bentley Approve
Review via email: mp+324045@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2017-05-14.

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

Looks good but has issues with trunk!

review: Needs Fixing
Revision history for this message
Phill (phill-ridout) wrote : Posted in a previous version of this proposal

I had merged with trunk, but forgot to update trunk!

Revision history for this message
Phill (phill-ridout) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
Tim Bentley (trb143) wrote :

Looks good.

review: Approve
Revision history for this message
Tomas Groth (tomasgroth) :
review: Approve
Revision history for this message
Phill (phill-ridout) :
review: Approve
Revision history for this message
Phill (phill-ridout) :
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.