lp:~sam92/openlp/worshipassistant-import

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2396

Raoul Snyman: Approve on 2014-07-02

Tomas Groth: Approve on 2014-07-01

Tim Bentley: Approve on 2014-06-30

Diff: 558 lines (+360/-24)

14 files modified

openlp/plugins/bibles/lib/http.py (+2/-2)
openlp/plugins/songs/lib/cclifileimport.py (+1/-1)
openlp/plugins/songs/lib/importer.py (+22/-9)
openlp/plugins/songs/lib/worshipassistantimport.py (+171/-0)
tests/functional/openlp_plugins/songs/test_opensongimport.py (+3/-3)
tests/functional/openlp_plugins/songs/test_propresenterimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_songshowplusimport.py (+3/-3)
tests/functional/openlp_plugins/songs/test_worshipassistantimport.py (+56/-0)
tests/helpers/songfileimport.py (+1/-1)
tests/resources/worshipassistantsongs/du_herr.csv (+30/-0)
tests/resources/worshipassistantsongs/du_herr.json (+21/-0)
tests/resources/worshipassistantsongs/would_you_be_free.csv (+30/-0)
tests/resources/worshipassistantsongs/would_you_be_free.json (+19/-0)
tests/utils/test_bzr_tags.py (+0/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1334130: Import from Worship Assistant

Wishlist

Fix Released

Link a bug report

Related blueprints

2405. By Samuel Mehrbrodt on 2014-06-30

Small fixes

2404. By Samuel Mehrbrodt on 2014-06-26

Fix bzr tags test

2403. By Samuel Mehrbrodt on 2014-06-26

Fix biblegateway url

2402. By Samuel Mehrbrodt on 2014-06-26

Remove debug output

2401. By Samuel Mehrbrodt on 2014-06-26

Add missing files

2400. By Samuel Mehrbrodt on 2014-06-26

Parse verse order

2399. By Samuel Mehrbrodt on 2014-06-25

Add missing files

2398. By Samuel Mehrbrodt on 2014-06-25

PEP8

2397. By Samuel Mehrbrodt on 2014-06-25

Add test

2396. By Samuel Mehrbrodt on 2014-06-25

Parse verse names