lp://qastaging/~tomasgroth/openlp/25bugfixes3

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/openlp at revision 2677

Raoul Snyman: Approve on 2016-06-15

Diff: 263 lines (+81/-24)

9 files modified

openlp/plugins/songs/lib/importers/mediashout.py (+18/-11)
openlp/plugins/songs/lib/importers/opspro.py (+3/-3)
openlp/plugins/songs/lib/importers/presentationmanager.py (+7/-1)
openlp/plugins/songs/lib/importers/songpro.py (+1/-1)
openlp/plugins/songs/lib/importers/songshowplus.py (+10/-4)
openlp/plugins/songs/lib/importers/videopsalm.py (+1/-3)
openlp/plugins/songs/lib/importers/worshipcenterpro.py (+1/-1)
tests/functional/openlp_plugins/songs/test_songshowplusimport.py (+2/-0)
tests/resources/songshowplussongs/cleanse-me.json (+38/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1582152: SongPro import fails with traceback	Medium	Fix Released
Bug #1585489: Traceback during songshowplus import	Medium	Fix Committed
Bug #1590657: MediaShout import causes traceback	Medium	Fix Released

Link a bug report

Related blueprints

2674. By Tomas Groth on 2016-06-14

pep8 fixes

2673. By Tomas Groth on 2016-06-14

Fix various pyodbc related issues. Fixes bug 1590657.

2672. By Tomas Groth on 2016-06-14

merge trunk

2671. By Tomas Groth on 2016-05-26

trunk

2670. By Tomas Groth on 2016-05-26

Fix of tracback during SongPro import. Fixes bug 1582152.

2669. By Tomas Groth on 2016-05-25

Fix traceback during songshowplus import. Fixes bug 1585489.

2668. By Tomas Groth on 2016-05-24

Skip PresentationManager files we do not support.

2667. By Tomas Groth on 2016-05-24

Fix traceback while handling traceback in videopsalm import

2666. By Ken Roberts on 2016-05-20

"- Convert strings in openlp/core/ui files
- Updated projectordb test

--------------------------------
lp:~alisonken1/openlp/strings-core-ui (revision 2667)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1566/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1477/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1415/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1195/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/78..."

2665. By Tim Bentley on 2016-05-19

Fix ssl version to allow Android to use ssl. SSL is now auto negotiated. Fix SeriveManager service theme hiding. Bug since 1.9 series. Fix missing check dependancies for six, Fix PEP 8 errors