lp:~sam92/openlp/presentationmanager-import

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2407

Tim Bentley: Approve on 2014-08-03

Raoul Snyman: Approve on 2014-08-03

Tomas Groth: Approve on 2014-07-14

Diff: 325 lines (+245/-16)

6 files modified

openlp/plugins/songs/lib/__init__.py (+1/-1)
openlp/plugins/songs/lib/importer.py (+22/-15)
openlp/plugins/songs/lib/importers/presentationmanager.py (+93/-0)
tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py (+53/-0)
tests/resources/presentationmanagersongs/Great Is Thy Faithfulness.json (+25/-0)
tests/resources/presentationmanagersongs/Great Is Thy Faithfulness.sng (+51/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #957017: Support Presentation Manager song import

Medium

Fix Released

Link a bug report

Related blueprints

2404. By Samuel Mehrbrodt on 2014-07-14

Merge conflict

2403. By Samuel Mehrbrodt on 2014-07-14

Merge trunk

2402. By Samuel Mehrbrodt on 2014-07-14

Fix import

2401. By Samuel Mehrbrodt on 2014-07-11

EOF; verse order fixed

2400. By Samuel Mehrbrodt on 2014-07-07

Space

2399. By Samuel Mehrbrodt on 2014-07-07

Merge trunk

2398. By Samuel Mehrbrodt on 2014-07-07

Gui entry

2397. By Samuel Mehrbrodt on 2014-07-07

Add Presentation Manager import

2396. By Samuel Mehrbrodt on 2014-07-03

Add an importer for Worship Assistant

2395. By Tomas Groth on 2014-07-02

Update vlc.py