lp:~tomasgroth/openlp/25bugfixes4

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2683

Raoul Snyman: Approve on 2016-07-27

Diff: 316 lines (+132/-31)

7 files modified

openlp/plugins/bibles/lib/http.py (+28/-22)
openlp/plugins/songs/lib/importers/easyslides.py (+1/-1)
openlp/plugins/songs/lib/importers/videopsalm.py (+8/-0)
tests/functional/openlp_plugins/songs/test_videopsalm.py (+2/-0)
tests/interfaces/openlp_plugins/bibles/test_lib_http.py (+11/-8)
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 #1562384: Biblegateway Downloads Amplified Classic instead of Amplified 2015	Low	Fix Committed
Bug #1588822: EasySlides importer causes traceback on unexpected chars	Low	Fix Committed
Bug #1594945: VideoPsalm import with control chars or escaped quotes causes traceback	Medium	Fix Committed
Bug #1599999: CrossWalk bible list is empty	Medium	Fix Committed

Link a bug report

Related blueprints

2685. By Tomas Groth on 2016-07-27

merge trunk

2684. By Tomas Groth on 2016-07-24

Use BibleGateway standard site instead of the legacy site. Fixes bug 1562384.

2683. By Tomas Groth on 2016-07-07

Update Crosswalk webpage parser to match new layout. Fixes bug 1599999.

2682. By Tomas Groth on 2016-07-07

Fix format error

2681. By Tomas Groth on 2016-07-07

Make easyslide importer try to recover when reading non-standard xml. Fixes bug 1588822.

2680. By Tomas Groth on 2016-07-07

forgot test file

2679. By Tomas Groth on 2016-07-07

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

2678. By Ken Roberts on 2016-07-07

Bugfix 1593882 and 1593883 - projector authorization

- Fix exception when authenticated connection requested and pin is None
- Fix pjlink authentication (use python hash instead of qt hash)
- Fix md5_hash functions
- Fix qmd5hash functions
- Added tests for bugfixes
Tested with test server and Eiki XL200 projector

--------------------------------
lp:~alisonken1/openlp/bug-1593883-projector-authentication (revision 2684)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1629/
[SUCCESS] https...

2677. By Tomas Groth on 2016-06-16

"Fix various pyodbc related issues. Fixes bug 1590657.
Fix of tracback during SongPro import. Fixes bug 1582152.
Fix traceback during songshowplus import. Fixes bug 1585489.
Skip PresentationManager files we do not support."

2676. 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 (revision 2675)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1603/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1514/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1452/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1225/
[SUCC...