lp://staging/~tomasgroth/openlp/25bugfixes1

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/openlp at revision 2628

Tim Bentley: Approve on 2016-03-15

Raoul Snyman: Approve on 2016-03-15

Diff: 239 lines (+76/-44)

7 files modified

openlp/core/ui/exceptionform.py (+6/-4)
openlp/plugins/custom/forms/editcustomform.py (+1/-0)
openlp/plugins/songs/lib/importers/easyworship.py (+40/-32)
openlp/plugins/songs/lib/mediaitem.py (+2/-2)
tests/functional/openlp_plugins/songs/test_mediaitem.py (+2/-2)
tests/interfaces/openlp_core_lib/test_pluginmanager.py (+9/-4)
tests/interfaces/openlp_plugins/custom/forms/test_customform.py (+16/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1547234: Missing Verses in EasyWorship 2009 Import	Low	Fix Committed
Bug #1553922: EasyWorship import throws exception on unknown character	Medium	Fix Committed
Bug #1554428: The bug-report window produces traceback when pressing "Send email"	Critical	Fix Committed
Bug #1554748: Slide Order Changes in Custom Slides	Low	Fix Committed

Link a bug report

Related blueprints

2631. By Tomas Groth on 2016-03-13

Fix slide order change when splitting custom slides. Fixes bug 1554748.

2630. By Tomas Groth on 2016-03-13

pep8 fixes

2629. By Tomas Groth on 2016-03-12

Fix EasyWorship import issues with missing verses and traceback on unknown chars.

2628. By Tomas Groth on 2016-03-12

Fix weird test bug.

2627. By Tomas Groth on 2016-03-12

Fix traceback in the bug-report dialog. Fixes bug 1554428.

2626. By Chris Hill on 2016-03-05

Fix for bug #1000729. Adds topic, copyright, CCLI number searching, including natural sort for CCLI number search, based on the existing 'Author' search.

2625. By Tomas Groth on 2016-02-29

Another attempt to fully fix bug 1531319.

2624. By Ken Roberts on 2016-02-28

- Fix projector manager receiving an invalid class response on initial connection
- Fix string encoding to ascii when sending request to projector

--------------------------------
lp:~alisonken1/openlp/bug-1550891 (revision 2624)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1301/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1223/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1162/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/997/...

2623. By Azaziah on 2016-02-28

This branch fixes the issue where Blank to desktop,
black and theme won't work if Live screen has stolen focus.

Examples of this happening: Clicking anything in the live window or certain single screen mode scenarios.

This was achieved by adding 3 lines of code, one for each method under the definition of methods available in this screen mode.

I also explained this in a comment I inserted to the code.

Since the only way to screw this seems to be by removing these additions,
a test for the...

2622. By Tomas Groth on 2016-02-15

Removed songs used in tests that is not in public domain.