lp:~trb143/openlp/themecombo-24

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.4 at revision 2649

Raoul Snyman: Approve on 2016-08-13

Diff: 66 lines (+40/-1)

2 files modified

openlp/core/ui/servicemanager.py (+1/-1)
tests/functional/openlp_core_ui/test_servicemanager.py (+39/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1596668: Service theme selector is missing if theme level is song or Service

Medium

Fix Released

Link a bug report

Related blueprints

2649. By Tim Bentley on 2016-08-13

Fix bug and test it

2648. By Raoul Snyman on 2016-08-12

Fix SongSelect.

Do updated tests count?

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1608194-2.4 (revision 2650)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1724/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1635/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1573/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1334/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_T...

2647. By Raoul Snyman on 2016-08-12

Update slot signatures to comply with PyQt5.6's stricter checks.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/stricter-slot-signatures-2.4 (revision 2649)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1722/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1633/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1571/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1332/
[SUCCESS] https://ci.openlp....

2646. By Raoul Snyman on 2016-08-02

Fix a permission error that we should have fixed ages ago.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/permission-error-2.4 (revision 2645)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1676/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1587/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1525/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1290/
[SUCCESS] https://ci.openlp.io/job/Branch-...

2645. By Raoul Snyman on 2016-08-02

Fix a permission error that we should have fixed ages ago.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/permission-error-2.4 (revision 2645)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1676/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1587/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1525/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1290/
[SUCCESS] https://ci.openlp.io/job/Branch-...

2644. By Tomas Groth on 2016-07-27

Use BibleGateway standard site instead of the legacy site. Fixes bug 1562384.
Update Crosswalk webpage parser to match new layout. Fixes bug 1599999.

2643. By Raoul Snyman on 2016-06-25

Release 2.4.2

2642. By Ken Roberts on 2016-06-25

"Bugfix 1588369 - projectorNetwork signal/slot signature mismatch

- Fix projectorNetwork signal signature
- Fix projector manager projectorNetwork signature and method call
- Updated pjlink1 test
- Merge 2.4 base and fix conflicts

--------------------------------
lp:~alisonken1/openlp/bug-1588369-2.4-projectorNetwork-signal (revision 2639)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1636/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1547/
[SUCCESS] https://ci.openlp.io..."

2641. By Tim Bentley on 2016-06-24

right translations this time

2640. By Tomas Groth on 2016-06-22

Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.