lp:~alisonken1/openlp/pjlink2-e

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2751

Tomas Groth: Approve on 2017-06-17

Raoul Snyman: Approve on 2017-06-17

Diff: 451 lines (+221/-35)

9 files modified

openlp/core/lib/db.py (+69/-1)
openlp/core/lib/projector/constants.py (+1/-1)
openlp/core/lib/projector/pjlink1.py (+5/-21)
openlp/core/lib/projector/pjlink2.py (+85/-0)
openlp/core/lib/projector/upgrade.py (+7/-5)
openlp/core/ui/projector/manager.py (+4/-1)
openlp/plugins/songs/lib/upgrade.py (+2/-0)
openlp/plugins/songusage/lib/upgrade.py (+16/-5)
tests/functional/openlp_core_lib/test_db.py (+32/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2754. By Ken Roberts on 2017-06-17

Minor cleanups on kwargs

2753. By Ken Roberts on 2017-06-10

Revert songs.upgrade, move pjlink_list from class to __init__

2752. By Ken Roberts on 2017-06-09

Fix missing sqlalchemy exception import

2751. By Ken Roberts on 2017-06-09

Test for db upgrade skip

2750. By Ken Roberts on 2017-06-09

More db fixes

2749. By Azaziah on 2017-06-08

Fixed bugs:
Bug #1639860: Close button is disabled in numerous windows
Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x" instead of "cancel" button and causes traceback on exit
Bug #1666272: Linked audio "next" button results in traceback
Bug #1678292: Space after Bible book name auto-completion is missing
Bug #1694732: wizard sub title does not wrap
Bug #1695268: Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot aft...

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

added SongBook name and Song Number to "Entire Song" Search

lp:~samothjtm/openlp/bug-1695587 (revision 2748)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2076/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1986/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1902/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1280/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1130/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/259...

2747. By Ken Roberts on 2017-06-08

-- Added openlp.core.lib.projector.upgrade for db version 1
-- Added test class for projector DB upgrade
-- Remove duplicate TEST_DB entry in tests.resources.projector.data
-- Updated TestProjectorDB to use a temporary directory for test db
-- Fix main db update procedure version check (default to version 0 if no version set)
-- Added extra information to projector info popup
-- Restructure valid command dictionary
-- Pep8 in plugins/songusage, plugins/presentations, and core/ui/lib/pathedit....

2746. By Phill on 2017-06-04

Fixed some bible media item tests and one render test. The 02-Functional tests now pass, but we get a seg fault on the interface-tests

lp:~phill-ridout/openlp/test-fixes (revision 2748)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2054/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1964/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1888/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1267/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Co...

2745. By Tomas Groth on 2017-05-30

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