lp:~alisonken1/openlp/pjlink2-a

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2736

Tim Bentley: Approve on 2017-05-17

Tomas Groth: Approve on 2017-05-17

Diff: 300 lines (+161/-58)

4 files modified

openlp/core/lib/projector/constants.py (+53/-51)
openlp/core/lib/projector/pjlink1.py (+49/-7)
tests/functional/openlp_core_lib/test_projector_constants.py (+44/-0)
tests/functional/openlp_core_lib/test_projector_pjlink1.py (+15/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2735. By Ken Roberts on 2017-05-15

Remove extraneous TODO

2734. By Ken Roberts on 2017-05-12

Initial PJLink class 2 updates

2733. By Raoul Snyman on 2017-05-10

Mock comes with Python as of 3.3, and I don't think there is anyone using lower than 3.3, so let's use Python's mock directly now.

Windows tests are failing due to file sharing (we've had this issue before), unrelated to my changes.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/refactor-mock (revision 2734)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1992/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1902/
[SUCCESS] https://...

2732. By Phill on 2017-05-06

Fix the QFormLayout in BibleImportForm
Fix one of the tests that was skipped

lp:~phill-ridout/openlp/test_fixes (revision 2732)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1973/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1883/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1824/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1206/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1074/
[SUCCESS] https://ci.openlp.io/job/Branch-04c...

2731. By Tomas Groth on 2017-05-05

Integrate the Jenkins setup with the AppVeyor setup, so that Jenkins fails if AppVeyor fails.

2730. By Raoul Snyman on 2017-03-28

Fix the author_type import properly

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-author_type (revision 2731)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1950/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1861/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1802/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1528/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/...

2729. By Raoul Snyman on 2017-03-28

Fix a problem with loading Qt's translation files, bug #1676163

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-translations (revision 2729)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1944/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1855/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1796/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1522/
[SUCCESS] https://ci.openlp.io/job/Branch...

2728. By Raoul Snyman on 2017-03-25

Various fixes and things:
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
...

2727. By Simon Hanna on 2017-03-13

Minor fix that makes sure that songbeamer files get decoded properly.

2726. By Tim Bentley on 2017-03-04

Will SSL being removed in 2.8 it and not supported in Android and iOS lets prevent it from living in 2.6.
Just removed the SSL code to stop the settings and not start the SSL server full removal will be in 2.8 when we change server infrastructure,
With test this time.

lp:~trb143/openlp/removessl26 (revision 2728)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1921/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1832/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Te...