OpenLP

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

  1. fixes-III
  2. Merge into trunk
Proposed by Phill
Status: Merged
Approved by: Raoul Snyman
Approved revision: 2886
Merged at revision: 2887
Proposed branch: lp://qastaging/~phill-ridout/openlp/fixes-III
Merge into: lp://qastaging/openlp
Diff against target: 765 lines (+218/-152)
26 files modified
openlp/core/common/__init__.py (+4/-4)
openlp/core/common/i18n.py (+3/-3)
openlp/core/lib/db.py (+1/-1)
openlp/core/lib/formattingtags.py (+91/-90)
openlp/core/projectors/manager.py (+2/-2)
openlp/core/projectors/pjlink.py (+1/-1)
openlp/core/projectors/sourceselectform.py (+3/-3)
openlp/core/ui/__init__.py (+1/-1)
openlp/core/ui/formattingtagcontroller.py (+1/-1)
openlp/core/ui/icons.py (+3/-3)
openlp/core/ui/shortcutlistdialog.py (+1/-1)
openlp/core/ui/shortcutlistform.py (+1/-1)
openlp/core/widgets/views.py (+3/-3)
openlp/core/widgets/widgets.py (+2/-2)
openlp/plugins/bibles/lib/manager.py (+1/-1)
openlp/plugins/bibles/lib/mediaitem.py (+1/-1)
openlp/plugins/presentations/lib/impresscontroller.py (+5/-11)
openlp/plugins/songs/lib/__init__.py (+10/-8)
openlp/plugins/songs/lib/importers/easyworship.py (+2/-2)
openlp/plugins/songs/lib/importers/foilpresenter.py (+1/-1)
openlp/plugins/songs/lib/importers/openoffice.py (+1/-3)
openlp/plugins/songs/lib/importers/opspro.py (+2/-2)
openlp/plugins/songs/lib/importers/propresenter.py (+4/-4)
openlp/plugins/songs/lib/importers/videopsalm.py (+1/-1)
openlp/plugins/songs/lib/openlyricsxml.py (+1/-1)
tests/functional/openlp_core/lib/test_theme.py (+72/-1)
To merge this branch: bzr merge lp://qastaging/~phill-ridout/openlp/fixes-III
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Raoul Snyman Approve
Tomas Groth Needs Information
Review via email: mp+370337@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2019-07-18.

Commit message

Minor fixes and changes

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 failed, please see https://ci.openlp.io/job/MP-02-Linux_Tests/206/ for more details

Revision history for this message
Tomas Groth (tomasgroth) wrote : Posted in a previous version of this proposal

Tests fails

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/139/ for more details

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
Tomas Groth (tomasgroth) wrote :

Just a question inline, otherwise it looks fine.

review: Needs Information
Revision history for this message
Tim Bentley (trb143) wrote :

See inline comments

review: Needs Information
Revision history for this message
Phill (phill-ridout) :
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.