lp:~trb143/openlp/bug-772523

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 1833

Raoul Snyman: Approve on 2011-12-12

Andreas Preikschat: Pending requested 2011-12-12

Diff: 349 lines (+91/-21)

11 files modified

openlp/core/lib/db.py (+8/-1)
openlp/core/lib/eventreceiver.py (+4/-0)
openlp/core/lib/serviceitem.py (+2/-0)
openlp/core/ui/maindisplay.py (+2/-2)
openlp/core/ui/servicemanager.py (+25/-6)
openlp/plugins/songs/forms/songexportform.py (+3/-0)
openlp/plugins/songs/lib/db.py (+2/-1)
openlp/plugins/songs/lib/mediaitem.py (+15/-3)
openlp/plugins/songs/lib/upgrade.py (+12/-1)
openlp/plugins/songs/lib/xml.py (+6/-7)
openlp/plugins/songs/songsplugin.py (+12/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #772523: "Update service from song edit" does work "too much"

Low

Fix Released

Link a bug report

Related blueprints

1781. By Tim Bentley on 2011-12-12

Fix review comments

1780. By Tim Bentley on 2011-12-12

Fix review comments

1779. By Tim Bentley on 2011-12-12

Head

1778. By Tim Bentley on 2011-12-10

clean up service

1777. By Tim Bentley on 2011-12-10

Lost temporary edit flag

1776. By Tim Bentley on 2011-12-10

Fixes and notifications

1775. By Tim Bentley on 2011-12-08

Head

1774. By Tim Bentley on 2011-12-08

Fixes

1773. By Tim Bentley on 2011-12-05

Head

1772. By Tim Bentley on 2011-12-05

Fix up song import code