lp:~sam92/openlp/bug-1326664

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2394

Tim Bentley: Approve on 2014-06-12

Raoul Snyman: Approve on 2014-06-12

Tomas Groth: Approve on 2014-06-12

Diff: 75 lines (+35/-2)

2 files modified

openlp/plugins/songs/lib/ewimport.py (+15/-2)
tests/functional/openlp_plugins/songs/test_ewimport.py (+20/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1326664: Can't import EasyWorship DB

Medium

Fix Released

Link a bug report

Related blueprints

2391. By Samuel Mehrbrodt on 2014-06-11

Better wording

2390. By Samuel Mehrbrodt on 2014-06-09

Add test for missing songs.mb

2389. By Samuel Mehrbrodt on 2014-06-08

Give proper error messages in EasyWorship import

2388. By Samuel Mehrbrodt on 2014-06-08

Various string fixes and other tidying up
- Fix some string errors
- remove unused variable
- Fix method name
- Add setup.cfg with config for pep8 (pep8 reads this file)
- Fixed errors in translation utils

2387. By Stewart Becker on 2014-06-04

Fixed a typo: load_Last_file -> load_last_file
Added tests for OpenSongImport and fixed some PEP8 issues.

2386. By Samuel Mehrbrodt on 2014-06-03

Song duplicates added when using different author types for the same author

2385. By Tomas Groth on 2014-05-31

Support for importing Zefania bible XML format

2384. By Samuel Mehrbrodt on 2014-05-31

Fix bug 1316979 by changing the 'authors' relation to readonly.

2383. By Samuel Mehrbrodt on 2014-05-27

Remove flickering when single click option is active

2382. By Jonathan Springer on 2014-05-11

Change how we define which menu items are included in the main menu on Mac OS
Change variable type to conform to expected type
Make vlcplayer stop() call asynchronous to avoid a deadlock with the UI thread
Add test for the main window function set_service_modified