lp:~phill-ridout/openlp/saved_bible_verses

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2743

Tomas Groth: Approve on 2017-05-30

Tim Bentley: Pending requested 2017-05-26

Diff: 1076 lines (+324/-202)

12 files modified

openlp/core/ui/lib/listwidgetwithdnd.py (+10/-4)
openlp/core/ui/lib/pathedit.py (+4/-4)
openlp/plugins/bibles/lib/__init__.py (+3/-3)
openlp/plugins/bibles/lib/db.py (+13/-0)
openlp/plugins/bibles/lib/manager.py (+15/-43)
openlp/plugins/bibles/lib/mediaitem.py (+178/-63)
openlp/plugins/presentations/presentationplugin.py (+1/-1)
openlp/plugins/songusage/forms/songusagedetaildialog.py (+1/-1)
resources/images/openlp-2.qrc (+2/-4)
tests/functional/openlp_core_ui_lib/test_listwidgetwithdnd.py (+33/-31)
tests/functional/openlp_plugins/bibles/test_mediaitem.py (+63/-47)
tests/interfaces/openlp_plugins/bibles/test_lib_parse_reference.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1625681: If Bible search results are locked, duplicated results are listed

Low

Fix Committed

Link a bug report

Related blueprints

2746. By Phill on 2017-05-26

PEP

2745. By Phill on 2017-05-26

head

2744. By Phill on 2017-05-07

Annother fix

2743. By Phill on 2017-05-07

A few minor changes + annother test

2742. By Phill on 2017-05-06

HEAD

2741. By Phill on 2017-05-06

mor PEP fixes

2740. By Phill on 2017-05-06

PEP fixes

2739. By Phill on 2017-05-06

Fixed up test

2738. By Phill on 2017-05-06

merge from test_fixes

2737. By Phill on 2017-05-06

head