lp:~phill-ridout/openlp/bug1367141-2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2487

Tim Bentley: Approve on 2015-01-24

Raoul Snyman: Approve on 2015-01-24

Diff: 315 lines (+100/-29)

10 files modified

openlp/core/__init__.py (+24/-15)
openlp/core/lib/mediamanageritem.py (+1/-2)
openlp/plugins/images/imageplugin.py (+10/-0)
openlp/plugins/images/lib/mediaitem.py (+2/-1)
openlp/plugins/presentations/lib/mediaitem.py (+13/-4)
openlp/plugins/presentations/lib/presentationcontroller.py (+13/-3)
openlp/plugins/presentations/presentationplugin.py (+16/-2)
tests/functional/openlp_plugins/presentations/test_impresscontroller.py (+3/-0)
tests/functional/openlp_plugins/presentations/test_pdfcontroller.py (+2/-1)
tests/functional/test_init.py (+16/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1367141: Presentations/Images with same name gets the same thumbnail

Low

Fix Released

Link a bug report

Related blueprints

2486. By Phill on 2015-01-24

test fix. Test options in order as per --help

2485. By Phill on 2015-01-22

remove print statments

2484. By Phill on 2015-01-22

pep fixes

2483. By Phill on 2015-01-22

PEP fix

2482. By Phill on 2015-01-22

test fixes

2481. By Phill on 2015-01-22

HEAD

2480. By Phill on 2015-01-22

fix tests

2479. By Phill on 2015-01-22

Add test

2478. By Phill on 2015-01-22

code tidies

2477. By Phill on 2015-01-20

Presentation fixes