OpenLP

Merge lp://qastaging/~trb143/openlp/alpha_fixes into lp://qastaging/openlp

  1. alpha_fixes
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Approved by: Raoul Snyman
Approved revision: 2897
Merged at revision: 2888
Proposed branch: lp://qastaging/~trb143/openlp/alpha_fixes
Merge into: lp://qastaging/openlp
Diff against target: 204 lines (+34/-20)
10 files modified
openlp/core/common/settings.py (+7/-6)
openlp/core/display/render.py (+1/-0)
openlp/core/display/screens.py (+7/-2)
openlp/core/threading.py (+2/-1)
openlp/core/ui/mainwindow.py (+4/-1)
openlp/core/ui/printserviceform.py (+5/-5)
openlp/core/ui/servicemanager.py (+2/-1)
openlp/core/ui/thememanager.py (+3/-2)
openlp/plugins/custom/lib/mediaitem.py (+1/-1)
openlp/plugins/songs/forms/editsongform.py (+2/-1)
To merge this branch: bzr merge lp://qastaging/~trb143/openlp/alpha_fixes
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Phill Approve
Review via email: mp+370938@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2019-08-04.

Commit message

Fixes all over the place.
* Migration from 2.4 to trunk now handles the screen definitions
* Custom generation from service manager works again
* Print service works
* Open last service works again.

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linting failed, please see https://ci.openlp.io/job/MP-03-Linting/142/ for more details

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

See inlines

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linting failed, please see https://ci.openlp.io/job/MP-03-Linting/143/ for more details

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linting passed!

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

One more, sorry I didn't mention it earlier

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linting passed!

Revision history for this message
Phill (phill-ridout) :
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
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.