lp://qastaging/~alisonken1/openlp/2.4-bug-1550891

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/openlp/2.4 at revision 2622

Raoul Snyman: Approve on 2016-03-03

Tim Bentley: Approve on 2016-03-03

Diff: 51 lines (+24/-2)

2 files modified

openlp/core/lib/projector/pjlink1.py (+10/-2)
tests/functional/openlp_core_lib/test_projector_pjlink1.py (+14/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2622. By Ken Roberts on 2016-03-03

Backport fix for non-standard reply for PJLink class request

2621. By Raoul Snyman on 2016-02-13

Release 2.4

2620. By Tim Bentley on 2016-02-13

Translations 1302

2619. By Tomas Groth on 2016-02-12

Fix for force-updating display on windows when using themes without transitions.
Pep8 fix + a test.

2618. By Raoul Snyman on 2016-02-12

"Fix the toggle song usage menu item not working

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1544263 (revision 2618)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1279/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1203/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1142/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/978/
Stopping after failure"

2617. By Raoul Snyman on 2016-02-06

Release 2.3.3

2616. By Tomas Groth on 2016-02-06

More workarounds for bug 1531319.
If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test.
Use the chosen encoding when importing from easyworship db.

2615. By Tim Bentley on 2016-02-06

Translations

2614. By Raoul Snyman on 2016-02-05

"Fixed a problem with the shortcuts.
Also tried to make the alternate clear button on the shortcuts dialog a little less weird.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1533246 (revision 2616)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1275/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1199/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1138/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functi..."

2613. By Raoul Snyman on 2016-02-05

"Fix up some warnings we get about BeautifulSoup's parser."