lp:~raoul-snyman/openlp/pyro-impress

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2878

Tim Bentley: Approve on 2019-06-06

Tomas Groth: Pending requested 2019-06-05

Diff: 2439 lines (+2223/-56)

14 files modified

.bzrignore (+29/-38)
openlp/core/common/path.py (+2/-0)
openlp/core/ui/media/mediacontroller.py (+2/-0)
openlp/plugins/presentations/lib/libreofficeserver.py (+431/-0)
openlp/plugins/presentations/lib/maclocontroller.py (+266/-0)
openlp/plugins/presentations/lib/presentationcontroller.py (+3/-1)
openlp/plugins/presentations/lib/presentationtab.py (+2/-2)
openlp/plugins/presentations/lib/serializers.py (+52/-0)
openlp/plugins/presentations/lib/vendor/do_not_delete.txt (+5/-0)
openlp/plugins/presentations/presentationplugin.py (+16/-14)
scripts/check_dependencies.py (+2/-0)
tests/functional/openlp_core/common/test_path.py (+12/-1)
tests/functional/openlp_plugins/presentations/test_libreofficeserver.py (+948/-0)
tests/functional/openlp_plugins/presentations/test_maclocontroller.py (+453/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2734. By Raoul Snyman on 2019-06-05

Fix license issues

2733. By Raoul Snyman on 2019-06-05

HEAD

2732. By Raoul Snyman on 2019-05-18

Fix up the tests

2731. By Raoul Snyman on 2019-05-18

Revert some changes from the HEAD merge; Add the lib directory to sys.path for running tests

2730. By Raoul Snyman on 2019-05-18

Fix some small issues from the move to a new ScreenList object

2729. By Raoul Snyman on 2019-05-18

Print out the location of the log file

2728. By Raoul Snyman on 2019-05-18

HEAD

2727. By Raoul Snyman on 2019-05-10

HEAD

2726. By Raoul Snyman on 2019-01-30

Get Pyro working again

2725. By Raoul Snyman on 2019-01-29

HEAD