Merge lp://qastaging/~tomasgroth/openlp/24bugfix-backport1 into lp://qastaging/openlp/2.4

Proposed by Tomas Groth
Status: Merged
Approved by: Raoul Snyman
Approved revision: 2625
Merged at revision: 2624
Proposed branch: lp://qastaging/~tomasgroth/openlp/24bugfix-backport1
Merge into: lp://qastaging/openlp/2.4
Diff against target: 336 lines (+109/-48)
12 files modified
openlp/core/ui/exceptionform.py (+6/-4)
openlp/plugins/bibles/lib/http.py (+1/-1)
openlp/plugins/bibles/lib/mediaitem.py (+3/-0)
openlp/plugins/bibles/lib/zefania.py (+2/-1)
openlp/plugins/custom/forms/editcustomform.py (+1/-0)
openlp/plugins/songs/lib/__init__.py (+2/-1)
openlp/plugins/songs/lib/importers/easyworship.py (+40/-32)
openlp/plugins/songs/lib/importers/songimport.py (+1/-1)
tests/functional/__init__.py (+3/-3)
tests/functional/openlp_plugins/songs/test_lib.py (+25/-1)
tests/interfaces/openlp_core_lib/test_pluginmanager.py (+9/-4)
tests/interfaces/openlp_plugins/custom/forms/test_customform.py (+16/-0)
To merge this branch: bzr merge lp://qastaging/~tomasgroth/openlp/24bugfix-backport1
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+292585@code.qastaging.launchpad.net

Description of the change

Fix slide order change when splitting custom slides. Fixes bug 1554748.
Fix EasyWorship import issues with missing verses and traceback on unknown chars. Fixes bug 1553922 and 1547234.
Fix traceback in the bug-report dialog. Fixes bug 1554428.
Fix weird test bug in test_pluginmanager.py.
Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863.
Set progress bar steps to number of chapters in zefania import.
Fix song tag detection. Fixes bug 1549549.
Fix a method call with too many parentheses, which fixes getting bible books from crosswalk.
Fix bug that prevents song book entries to be imported.

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) wrote :
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.

Subscribers

People subscribed via source and target branches

to all changes: