lp:~tomasgroth/openlp/bugfixes4

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2440

Tim Bentley: Approve on 2014-11-07

Raoul Snyman: Approve on 2014-11-06

Diff: 440 lines (+179/-40)

12 files modified

openlp.py (+7/-1)
openlp/core/ui/projector/__init__.py (+1/-1)
openlp/plugins/media/forms/mediaclipselectorform.py (+7/-0)
openlp/plugins/songs/forms/duplicatesongremovalform.py (+8/-6)
openlp/plugins/songs/lib/importers/wordsofworship.py (+11/-5)
openlp/plugins/songs/lib/songcompare.py (+9/-7)
tests/functional/openlp_core_ui/test_settingsform.py (+1/-1)
tests/functional/openlp_plugins/images/test_imagetab.py (+1/-1)
tests/functional/openlp_plugins/songs/test_lib.py (+16/-18)
tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py (+56/-0)
tests/resources/wordsofworshipsongs/Amazing Grace (6 Verses).json (+33/-0)
tests/resources/wordsofworshipsongs/When morning gilds the skies.json (+29/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1387293: Unable to set Start/End time on DVD clip	Medium	Fix Released
Bug #1388768: Import of Words Of Worship file (WSG) fails	Medium	Fix Released
Bug #1388850: Find duplicate songs doesn't work on windows	Medium	Fix Released

Link a bug report

Related blueprints

2448. By Tomas Groth on 2014-11-06

pep8 fix

2447. By Tomas Groth on 2014-11-06

Re-re-fix duplicate song check on windows, and now it actually works in builds.

2446. By Tomas Groth on 2014-11-05

Second attempt to fix duplicate-song-detection on windows

2445. By Tomas Groth on 2014-11-05

Added one more test file for WoW import

2444. By Tomas Groth on 2014-11-05

Change duplicate check to pass int-string tuples to workers, to workaround windows issue, see bug #1388850

2443. By Tomas Groth on 2014-11-04

Make it possible to break out of waiting loop

2442. By Tomas Groth on 2014-11-03

Try to fix 0 track length by waiting. Fixes bug 1387293

2441. By Tomas Groth on 2014-11-03

Added test for Word of Worship import

2440. By Tomas Groth on 2014-11-03

Fix for import of Words of Worship file

2439. By Phill on 2014-11-02

Fix release tag checker for 2.1.1