lp:~tomasgroth/openlp/25bugfixes2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2639

Raoul Snyman: Approve on 2016-04-12

Tim Bentley: Approve on 2016-04-12

Diff: 195 lines (+51/-19)

9 files modified

openlp/core/ui/firsttimewizard.py (+7/-4)
openlp/core/ui/thememanager.py (+2/-2)
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/songs/lib/__init__.py (+2/-1)
openlp/plugins/songs/lib/importers/wordsofworship.py (+6/-6)
tests/functional/__init__.py (+3/-3)
tests/functional/openlp_plugins/songs/test_lib.py (+25/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1545072: Translation issues	Low	Fix Committed
Bug #1549549: import OpenSong songs with problem	Medium	Fix Committed
Bug #1553863: If searching apocrypha book name while 2nd bible does not have it = Traceback	Low	Fix Committed
Bug #1554554: translation on 639 text	Low	Fix Committed

Link a bug report

Related blueprints

2640. By Tomas Groth on 2016-04-10

trunk

2639. By Tomas Groth on 2016-04-10

Fix a method call with too many parentheses.

2638. By Tomas Groth on 2016-04-06

Made a exception catch more specific.

2637. By Tomas Groth on 2016-03-29

pep8 fix

2636. By Tomas Groth on 2016-03-29

Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863.

2635. By Tomas Groth on 2016-03-25

Set progress bar steps to number of chapters.

2634. By Tomas Groth on 2016-03-23

Use standard button text in the FTW, if possible. Fixes bug 1554554.

2633. By Tomas Groth on 2016-03-22

Translation fixes. Fixes bug 1545072

2632. By Tomas Groth on 2016-03-22

Fix tag detection. Fixes bug 1549549.

2631. By Tomas Groth on 2016-03-22

Add support for importing OPS Pro song DB. Translations are supported using a {translation} tag.
Fix bug that prevents song book entries to be imported.