lp:~samothjtm/openlp/bug-1695587

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2748

Tim Bentley: Approve on 2017-06-08

Samuel Mehrbrodt (community): Approve on 2017-06-08

Tomas Groth: Approve on 2017-06-06

Raoul Snyman: Pending requested 2017-06-05

Diff: 73 lines (+42/-4)

2 files modified

openlp/plugins/songs/lib/mediaitem.py (+8/-3)
tests/functional/openlp_plugins/songs/test_mediaitem.py (+34/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1695587: Entire Song doesn't search Song Number

Wishlist

Fix Committed

Link a bug report

Related blueprints

2748. By Johannes Thomas Meyer on 2017-06-05

implemented fix suggestions

2747. By Johannes Thomas Meyer on 2017-06-04

merge trunk

2746. By Johannes Thomas Meyer on 2017-06-03

added SongBook name, Song Number and Alternative Title to Entire Search

2745. By Tomas Groth on 2017-05-30

Fixed songshowplus encoding issue.
Fixed issue where enable-chord settings was not setup correctly for tests.

2744. By Tim Bentley on 2017-05-30

Finally got round to finishing the Theme clean up from 2,2!

Themes now save to JSON and read XML or JSON so fully compatible with 2.4.

Add this to your merge proposal:
--------------------------------
lp:~trb143/openlp/themecleanup (revision 2743)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2036/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1946/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1875/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analy...

2743. By Phill on 2017-05-30

Merged in trunk

Adds more flexibility to 'locking' bible verses.
fixes #1625681 "If Bible search results are locked, duplicated results are listed"

lp:~phill-ridout/openlp/saved_bible_verses (revision 2746)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2030/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1940/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1871/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1251/
[SUCCESS] https://ci.openlp.io...

2742. By Phill on 2017-05-23

Add a custom widget for editing and selecting paths. Implemented in OpenLP, with the exception of the import wizards, as I have other plans for refactoring these!

lp:~phill-ridout/openlp/path_edit (revision 2737)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2009/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1919/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1855/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1235/
[SUCCESS] https://ci.openl...

2741. By Gary Talent on 2017-05-22

Add support for importing EasyWorship 6 databases

2740. By Ken Roberts on 2017-05-22

-- Update test data for Class 2 tests
-- Update Projector() db class with new data
-- Update test_projectordb tests
-- Rename PJLink1 class to PJLink
-- Fix/update power on/off tests (Qt error not caught properly during test)
-- Remove skip from projector constants test

--------------------------------
lp:~alisonken1/openlp/pjlink2-c (revision 2739)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2020/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1930/
[SUCCESS] https://ci...

2739. By Ken Roberts on 2017-05-22

-- Add pjlink version 1 old database for testing db upgrade

No code changes at this time.

(resubmit was due to trying to add updated test data before tests were updated)

--------------------------------
lp:~alisonken1/openlp/pjlink2-c-resources (revision 2738)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2019/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1929/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1864/
[SUCCESS] https://ci.openlp.io/job/Branch...