lp:~alisonken1/openlp/pjlink2-l

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2789

Phill: Approve on 2017-11-18

Raoul Snyman: Approve on 2017-11-17

Diff: 4652 lines (+2155/-2158)

27 files modified

openlp/core/lib/__init__.py (+0/-3)
openlp/core/projectors/__init__.py (+4/-2)
openlp/core/projectors/db.py (+2/-2)
openlp/core/projectors/editform.py (+2/-2)
openlp/core/projectors/manager.py (+7/-8)
openlp/core/projectors/pjlink.py (+1/-5)
openlp/core/projectors/sourceselectform.py (+2/-2)
openlp/core/projectors/tab.py (+1/-1)
openlp/core/ui/__init__.py (+4/-3)
openlp/core/ui/firsttimewizard.py (+2/-2)
openlp/core/ui/mainwindow.py (+3/-3)
openlp/core/ui/projector/__init__.py (+0/-24)
openlp/core/ui/settingsform.py (+1/-1)
tests/functional/openlp_core/lib/test_projector_constants.py (+0/-43)
tests/functional/openlp_core/lib/test_projector_db.py (+0/-462)
tests/functional/openlp_core/lib/test_projector_pjlink_base.py (+0/-209)
tests/functional/openlp_core/lib/test_projector_pjlink_cmd_routing.py (+0/-224)
tests/functional/openlp_core/lib/test_projector_pjlink_commands.py (+0/-1149)
tests/functional/openlp_core/projectors/__init__.py (+24/-0)
tests/functional/openlp_core/projectors/test_projector_constants.py (+43/-0)
tests/functional/openlp_core/projectors/test_projector_db.py (+462/-0)
tests/functional/openlp_core/projectors/test_projector_pjlink_base.py (+209/-0)
tests/functional/openlp_core/projectors/test_projector_pjlink_cmd_routing.py (+224/-0)
tests/functional/openlp_core/projectors/test_projector_pjlink_commands.py (+1149/-0)
tests/interfaces/openlp_core/ui/test_projectoreditform.py (+7/-6)
tests/interfaces/openlp_core/ui/test_projectormanager.py (+4/-3)
tests/interfaces/openlp_core/ui/test_projectorsourceform.py (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2785. By Ken Roberts on 2017-11-16

Projector imports to fully-qualified, renamed projector dock

2784. By Ken Roberts on 2017-11-15

Merge trunk

2783. By Ken Roberts on 2017-11-10

PJLink2-L updates

2782. By Raoul Snyman on 2017-11-02

Found and fixed some tests that were not getting picked up

2781. By Raoul Snyman on 2017-10-25

Merge in refactorings-3

2780. By Raoul Snyman on 2017-10-10

Refactored ScreenList into a new display module, and refactored the directory structure of the tests to make things slightly simpler (just follow the module structure)

2779. By Raoul Snyman on 2017-10-10

Fix some issues from the mergefest

2778. By Raoul Snyman on 2017-10-10

Refactored 'check_directory_exists' into the more appropriate 'create_paths'; and solve some circular dependency issues

2777. By Tim Bentley on 2017-10-03

Add option to add a split to a song
This will split the verse when added to the service but keep the verse together for editing.
Useful for the 10 line hymn verses which need 2 slides to display.

Fix some iffy spelling

lp:~trb143/openlp/splitter (revision 2738)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2182/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2085/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1972/
[SUCCESS] https://ci.openlp.io/job/Branch...

2776. By Phill on 2017-10-01

Regen resources to remove old qr codes and add new qr code