lp:~alisonken1/openlp/pjlink2-f

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2753

Raoul Snyman: Approve on 2017-08-01

Tomas Groth: Approve on 2017-07-21

Tim Bentley: Pending requested 2017-07-20

Diff: 838 lines (+321/-126)

8 files modified

openlp/core/lib/projector/db.py (+1/-1)
openlp/core/lib/projector/pjlink1.py (+141/-49)
openlp/core/lib/projector/pjlink2.py (+4/-4)
openlp/core/lib/projector/upgrade.py (+1/-4)
openlp/core/ui/projector/manager.py (+14/-24)
openlp/core/ui/projector/sourceselectform.py (+2/-2)
setup.cfg (+11/-1)
tests/functional/openlp_core_lib/test_projector_pjlink1.py (+147/-41)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2758. By Ken Roberts on 2017-07-20

Added calls to new functions

2757. By Ken Roberts on 2017-07-20

Merge trunk

2756. By Ken Roberts on 2017-07-12

Ooops - removed commented code no longer needed

2755. By Ken Roberts on 2017-07-07

Cleanups part 3

2754. By Ken Roberts on 2017-06-29

Drop future import comments

2753. By Ken Roberts on 2017-06-29

noqa cleanlups

2752. By Ken Roberts on 2017-06-25

PJLink update F

2751. By Ken Roberts on 2017-06-22

-- Fix docstring for pjlink2 db upgrade
-- Add PJLink2 module for UDP socket (skeleton)
-- Move ProjectorManager.projector_list to class attribute
-- Added database_exists check for first time install skip upgrade checks
-- Fix db upgrade for songs
-- Fix db upgrade for songusage
-- Added database_exists from sqlalchemy_utils
-- Added test for skipping upgrade on no db
-- Revert songs db upgrade_7 back to upgrade_6
-- kwargs cleanup

--------------------------------
lp:~alisonken1/openlp/pjli...

2750. By Phill on 2017-06-09

I've TODOne some of the TODO's. As well as some other clean ups

lp:~phill-ridout/openlp/TODOne (revision 2745)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2077/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1987/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1903/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1281/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1131/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/2...

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...