lp:~sam92/openlp/multiple-songbooks

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2600

Tim Bentley: Approve on 2016-01-09

Tomas Groth: Approve on 2016-01-09

Raoul Snyman: Pending requested 2016-01-09

Diff: 973 lines (+438/-133)

12 files modified

openlp/core/utils/db.py (+71/-0)
openlp/plugins/songs/forms/editsongdialog.py (+34/-23)
openlp/plugins/songs/forms/editsongform.py (+78/-45)
openlp/plugins/songs/forms/songbookdialog.py (+2/-2)
openlp/plugins/songs/lib/db.py (+50/-5)
openlp/plugins/songs/lib/mediaitem.py (+28/-28)
openlp/plugins/songs/lib/openlyricsxml.py (+6/-12)
openlp/plugins/songs/lib/ui.py (+2/-2)
openlp/plugins/songs/lib/upgrade.py (+33/-2)
tests/functional/openlp_core_utils/test_db.py (+96/-0)
tests/functional/openlp_plugins/songs/test_db.py (+20/-3)
tests/functional/openlp_plugins/songs/test_mediaitem.py (+18/-11)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2607. By Samuel Mehrbrodt on 2016-01-09

Fix tests

2606. By Samuel Mehrbrodt on 2016-01-09

PEP8

2605. By Samuel Mehrbrodt on 2016-01-09

songbookentry -> songbook_entry, mock_song -> song

2604. By Samuel Mehrbrodt on 2016-01-09

Merge

2603. By Samuel Mehrbrodt on 2016-01-08

Merge branch

2602. By Samuel Mehrbrodt on 2016-01-08

Merge trunk

2601. By Samuel Mehrbrodt on 2016-01-07

Fix migration for non-sqlite

2600. By Samuel Mehrbrodt on 2016-01-05

Use deepcopy instead of copy

2599. By Samuel Mehrbrodt on 2016-01-05

Add test for deleting columns in a db

2598. By Samuel Mehrbrodt on 2016-01-05

Add missing file