lp:~tomasgroth/openlp/videopsalm-fix-24

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.4 at revision 2640

Raoul Snyman: Approve on 2016-06-22

Tim Bentley: Approve on 2016-06-22

Diff: 120 lines (+92/-0)

4 files modified

openlp/plugins/songs/lib/importers/videopsalm.py (+8/-0)
tests/functional/openlp_plugins/songs/test_videopsalm.py (+2/-0)
tests/resources/videopsalmsongs/as-safe-a-stronghold2.json (+35/-0)
tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold2.json (+47/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1594945: VideoPsalm import with control chars or escaped quotes causes traceback

Medium

Fix Committed

Link a bug report

Related blueprints

2639. By Tomas Groth on 2016-06-21

merge trunk

2638. By Tomas Groth on 2016-06-21

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

2637. By Raoul Snyman on 2016-06-14

Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1589815-2.4 (revision 2637)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1604/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1515/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1453/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1226/
[...

2636. By Tim Bentley on 2016-05-26

Translations

2635. By Tomas Groth on 2016-05-24

Fix of tracback during SongPro import. Fixes bug 1582152.
Backport of song-search-fix from trunk
Added support for using the new mutool in mudraw mode
Fix crosswalk bible list download
Fix traceback if bible list download fails.

2634. By Tim Bentley on 2016-05-24

Fix Android SSL
Fix Service Manager
Fix Formatting Tags
Add test

2633. By Tomas Groth on 2016-05-24

pep8 fixes

2632. By Raoul Snyman on 2016-05-13

Fix the Transifex API URL

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/transifex-api-2.4 (revision 2632)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1536/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1447/
[FAILURE] https://ci.openlp.io/job/Branch-03-Interface-Tests/1385/

2631. By Raoul Snyman on 2016-05-12

"Fix the Transifex API URL

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/transifex-api-2.4 (revision 2632)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1536/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1447/
[FAILURE] https://ci.openlp.io/job/Branch-03-Interface-Tests/1385/"

2630. By Raoul Snyman on 2016-04-30

Release 2.4.1