lp:~suutari-olli/openlp/click-slide-to-go-live-from-blank

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2689

Tim Bentley: Approve on 2016-08-10

Raoul Snyman: Approve on 2016-08-10

Tomas Groth: Pending requested 2016-08-10

Diff: 247 lines (+85/-6)

6 files modified

openlp/core/common/settings.py (+1/-0)
openlp/core/lib/mediamanageritem.py (+1/-0)
openlp/core/ui/generaltab.py (+7/-0)
openlp/core/ui/slidecontroller.py (+25/-5)
openlp/plugins/presentations/lib/messagelistener.py (+5/-1)
tests/functional/openlp_core_ui/test_slidecontroller.py (+46/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1462420: Double click on the preview duplicated the element in the service manger	Low	Fix Committed
Bug #1531691: Song is sent back to live after edit if blanked	Medium	Fix Committed

Link a bug report

Related blueprints

2664. By Azaziah on 2016-08-10

- Merged trunk and resolved conflict that was created by ui-messages-part-1 branch.

2663. By Azaziah on 2016-08-09

- Merged trunk on 10/8/16.

2662. By Azaziah on 2016-07-31

- Merged trunk on 31.7.16

2661. By Azaziah on 2016-07-17

- removed one unrequired if statement.

2660. By Azaziah on 2016-07-17

- Moved them to another init since something broke

2659. By Azaziah on 2016-07-17

- Moved the 2nd new registry flag from one init to an another init which also has the 1st

2658. By Azaziah on 2016-07-17

- Fixed the issue where items sent to Preview from Service may cause tracebacks.

2657. By Azaziah on 2016-07-16

- Reduced comments
- Removed unrequired reg_value from test.

2656. By Azaziah on 2016-07-16

Fixed the tests.

2655. By Azaziah on 2016-07-14

pep8 fixes, test still broken.