lp:~phill-ridout/openlp/fixes-mkIV

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2794

Tim Bentley: Approve on 2017-12-05

Raoul Snyman: Approve on 2017-12-05

Diff: 390 lines (+96/-43)

12 files modified

openlp/core/api/deploy.py (+2/-0)
openlp/core/api/http/server.py (+4/-1)
openlp/core/app.py (+2/-2)
openlp/core/common/settings.py (+1/-1)
openlp/core/ui/media/mediacontroller.py (+3/-5)
openlp/core/ui/media/vlcplayer.py (+6/-5)
openlp/core/ui/servicemanager.py (+7/-3)
openlp/plugins/media/forms/mediaclipselectorform.py (+7/-6)
openlp/plugins/media/lib/mediaitem.py (+4/-5)
tests/functional/openlp_core/lib/test_exceptions.py (+45/-0)
tests/functional/openlp_core/lib/test_mediamanageritem.py (+9/-9)
tests/functional/openlp_core/ui/media/test_vlcplayer.py (+6/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1514545: DVD audio/subtitle track selection is broken	Medium	Fix Committed
Bug #1735765: Launching OpenLP in portable mode results in a traceback	Medium	Fix Committed

Link a bug report

Related blueprints

2798. By Phill on 2017-12-04

PEP8

2797. By Phill on 2017-12-04

Test fixes

2796. By Phill on 2017-12-02

Few test fixes

2795. By Phill on 2017-12-02

Minor fixes

2794. By Phill on 2017-12-02

head

2793. By Phill on 2017-11-22

Fix dvd clip selection. Pretty much coppied from lp:~mikey74/openlp/dvdplayerfix/

2792. By Phill on 2017-11-22

service fixes

2791. By Phill on 2017-11-22

HEAD

2790. By Phill on 2017-11-22

Pathfixes

2789. By Ken Roberts on 2017-11-18

- Move openlp.core.lib.projector to openlp.core.projectors
- Move openlp.core.ui.projector to openlp.core.projectors
- Move tests.functional.openlp_core/lib/test_projector* to tests.functional.openlp.core.projectors
- Fix imports for new projector location
- Convert projector imports to fully-qualified import
- Fix delete projector item in ui.manager
- Fix projector tests
- Merge trunk (fix tests)
- Rename "Projector" dock to "Projector Controller"
--------------------------------------------...