OpenLP

Merge lp://qastaging/~suutari-olli/openlp/add-bible-license-field into lp://qastaging/openlp

  1. add-bible-license-field
  2. Merge into trunk
Proposed by Azaziah
Status: Merged
Merged at revision: 2716
Proposed branch: lp://qastaging/~suutari-olli/openlp/add-bible-license-field
Merge into: lp://qastaging/openlp
Diff against target: 400 lines (+125/-23)
9 files modified
openlp/core/common/uistrings.py (+10/-7)
openlp/plugins/bibles/forms/bibleimportform.py (+17/-2)
openlp/plugins/bibles/forms/editbibledialog.py (+7/-0)
openlp/plugins/bibles/forms/editbibleform.py (+23/-4)
openlp/plugins/bibles/lib/manager.py (+5/-5)
openlp/plugins/songs/lib/mediaitem.py (+7/-2)
openlp/plugins/songs/lib/songstab.py (+13/-1)
openlp/plugins/songs/songsplugin.py (+1/-0)
tests/functional/openlp_plugins/songs/test_mediaitem.py (+42/-2)
To merge this branch: bzr merge lp://qastaging/~suutari-olli/openlp/add-bible-license-field
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+314293@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-12-18.

Description of the change

In this branch:
- Added "Full License" field for Bibles (1623631)
- Added a setting for controlling visibility of "Written by:" (1557579)
- Added placeholder texts for Bible metadata fields
- Re-organized uistrings to alphabetical order

Add this to your merge proposal:
--------------------------------
lp:~suutari-olli/openlp/add-bible-license-field (revision 2714)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1889/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1800/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1739/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1475/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1065/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1133/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/1001/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/145/

D:\bzr\openlp\add-bible-license-field>

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

Needs a test just a minor fix is not enough
Some inline comments.

review: Needs Fixing
Revision history for this message
Azaziah (suutari-olli) wrote : Posted in a previous version of this proposal

Thanks for the comments, I've replied to them.

Revision history for this message
Azaziah (suutari-olli) wrote : Posted in a previous version of this proposal

> Needs a test just a minor fix is not enough
> Some inline comments.

I've replied to the comments,
will work on a test later.

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

A few small fixes and then you should be good to go.

review: Needs Fixing
Revision history for this message
Azaziah (suutari-olli) wrote : Posted in a previous version of this proposal

Thanks for the review, I've fixed them.

Revision history for this message
Tim Bentley (trb143) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Tim Bentley (trb143) :
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.