lp://qastaging/~tomasgroth/openlp/24bugfix-backport5

Branch merges

Propose for merging

No branches dependent on this one.

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

Raoul Snyman: Approve on 2016-09-24

Diff: 45 lines (+7/-4)

3 files modified

openlp/plugins/bibles/lib/http.py (+1/-1)
openlp/plugins/songs/lib/importers/mediashout.py (+1/-1)
openlp/plugins/songs/lib/importers/songimport.py (+5/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1618489: Improper characters in Mediashout import cause traceback

Undecided

Fix Committed

Link a bug report

Related blueprints

2654. By Tomas Groth on 2016-09-23

Fix handling special chars in MediaShout import. Fixes bug 1618489.

2653. By Tomas Groth on 2016-09-23

Fix getting text from crosswalk bibles.

2652. By Tim Bentley on 2016-09-21

Translation updates

2651. By Raoul Snyman on 2016-08-14

Fix bug #1547964 by ignoring the exception (it's harmless)

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/disconnect-slots-2.4 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1741/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1652/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1590/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1346/
[SUCCESS] https://ci.openlp.io/job/Branch...

2650. By Tim Bentley on 2016-08-14

Translation updates

2649. By Tim Bentley on 2016-08-13

Fix bug and fully test it.

lp:~trb143/openlp/themecombo-24 (revision 2649)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1730/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1641/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1579/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1339/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/929/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/997/
[SUCCESS] htt...

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