lp:~raoul-snyman/openlp/bug-1557514-2.4

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.4 at revision 2626

Tim Bentley: Approve on 2016-04-27

Tomas Groth: Approve on 2016-04-27

Diff: 294 lines (+139/-28)

4 files modified

.bzrignore (+1/-0)
openlp/plugins/songs/lib/db.py (+1/-1)
openlp/plugins/songs/lib/importers/openlp.py (+61/-27)
tests/functional/openlp_plugins/songs/test_openlpimporter.py (+76/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1557514: Error when importing OLP Song Database

Medium

Fix Committed

Link a bug report

Related blueprints

2625. By Raoul Snyman on 2016-04-27

Fix bug #1557514 by autodetecting the columns of the tables in the songs database

2624. By Tomas Groth on 2016-04-22

"Fix slide order change when splitting custom slides. Fixes bug 1554748.
Fix EasyWorship import issues with missing verses and traceback on unknown chars. Fixes bug 1553922 and 1547234.
Fix traceback in the bug-report dialog. Fixes bug 1554428.
Fix weird test bug in test_pluginmanager.py.
Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863.
Set progress bar steps to number of chapters in zefania import.
Fix song tag detection. Fixes bug 1549549.
Fix a m..."

2623. By Tim Bentley on 2016-04-03

"Fix the service when the theme changes"

2622. By Ken Roberts on 2016-03-03

"Bugfix #1550891 Projector manager rejecting replies as invalid (backport from trunk)

--------------------------------
lp:~alisonken1/openlp/2.4-bug-1550891 (revision 2622)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1306/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1228/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1167/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1002/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_I..."

2621. By Raoul Snyman on 2016-02-13

Release 2.4

2620. By Tim Bentley on 2016-02-13

Translations 1302

2619. By Tomas Groth on 2016-02-12

Fix for force-updating display on windows when using themes without transitions.
Pep8 fix + a test.

2618. By Raoul Snyman on 2016-02-12

"Fix the toggle song usage menu item not working

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1544263 (revision 2618)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1279/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1203/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1142/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/978/
Stopping after failure"

2617. By Raoul Snyman on 2016-02-06

Release 2.3.3

2616. By Tomas Groth on 2016-02-06

More workarounds for bug 1531319.
If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test.
Use the chosen encoding when importing from easyworship db.