lp:~tomasgroth/openlp/zionworx-fix-22

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.2 at revision 2567

Tomas Groth: Approve on 2015-10-29

Tim Bentley: Approve on 2015-10-29

Diff: 167 lines (+102/-7)

4 files modified

openlp/plugins/songs/lib/importers/zionworx.py (+7/-7)
tests/functional/openlp_plugins/songs/test_zionworximport.py (+20/-0)
tests/resources/zionworxsongs/zionworx.csv (+45/-0)
tests/resources/zionworxsongs/zionworx.json (+30/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2564. By Tomas Groth on 2015-10-28

Make zionworx importer work with python3.

2563. By Tim Bentley on 2015-10-28

Fix translations

2562. By Tim Bentley on 2015-10-17

Release 2.2

2561. By Tim Bentley on 2015-10-16

Fixed translations by removing ../../

Last set of translations before 2.2 this weekend.

2560. By Tomas Groth on 2015-10-15

Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows.

2559. By Raoul Snyman on 2015-10-14

"Let's download things once only, instead of 3 times."

2558. By Tomas Groth on 2015-10-13

Make 2 texts translatable.
Remove unneeded quotes from commit message in the merge-script.

2557. By Tomas Groth on 2015-10-11

"Added merge-helper-script
Some Pep8 fixes"

2556. By Tomas Groth on 2015-10-03

"Fix string that makes it possible to translate the string.
Updated QR code pointing to android app.
Update link to google play store.
"

2555. By Tim Bentley on 2015-09-10

Fix code so will actually start and long line lenght which broken standards