lp:~raoul-snyman/openlp/fix-lp-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2819

Tim Bentley: Approve on 2018-05-05

Diff: 27 lines (+6/-5)

1 file modified

scripts/lp-merge.py (+6/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2819. By Raoul Snyman on 2018-05-04

The merge proposal page seems to have changed a bit, fix up the script to match the page

2818. By Ken Roberts on 2018-04-20

PJLink2 update Q

--------------------------------------------------------------------------------

lp:~alisonken1/openlp/pjlink2-q (revision 2818)
https://ci.openlp.io/job/Branch-01-Pull/2506/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2407/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/193/ [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/105/ [SUCCESS]
https://ci.openlp.io/job/...

2817. By Simon Hanna on 2018-04-18

Fix the fix for 1727517

2816. By Tim Bentley on 2018-04-06

Replace the Memory check with a local server which stops and starts correctly.
One the 2nd instance pass the service file if one is included
Stop the 2nd instance starting as it will fail due to port clashes and a monster thread issue(may be connected).
Removed redundant code
Add a number of new tests.

lp:~trb143/openlp/localserver (revision 2850)
https://ci.openlp.io/job/Branch-01-Pull/2501/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2402/ ...

2815. By Tim Bentley on 2018-03-21

Fix issues with VLC

lp:~trb143/openlp/media2018a (revision 2838)
https://ci.openlp.io/job/Branch-01-Pull/2481/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2382/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/169/ [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/91/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/84/ [SUCCESS]
https://ci.openlp.io/job/B...

2814. By Tim Bentley on 2018-03-18

Add some small items from wish lists
Various cleanups.

--------------------------------------------------------------------------------
lp:~trb143/openlp/cleanups02182 (revision 2835)
https://ci.openlp.io/job/Branch-01-Pull/2480/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2381/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/168/ [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/90/ ...

2813. By Ken Roberts on 2018-02-16

- manager: Remove unused signal disconnect projectorNetwork.disconnect()
- Change PJLinkUDP.pjlink_udp_commands to dict with link to processing methods
- Add test_projector_pjlink_udp.test_process_ackn_duplicate
- Add test_projector_pjlink_udp.test_process_ackn_multiple
- Add test_projector_pjlink_udp.test_process_ackn_single
- Add test_projector_pjlink_udp.test_process_srch
- Add PJLinkUDP.get_datagram method
- Add PJLinkUDP._trash_udp_buffer method
- Add PJLinkUDP.process_ackn method
- Add ...

2812. By Tim Bentley on 2018-02-03

Remove Powerpoint Viewer
Clean up the logging framework and add to MainWindow
Fix bug in remote API
various minor text fixes.

lp:~trb143/openlp/cleanups2018 (revision 2827)
https://ci.openlp.io/job/Branch-01-Pull/2441/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2342/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/136/ [SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/58/ [SUCCES...

2811. By Raoul Snyman on 2018-01-24

Fixed an issue with the FTW not displaying any download progress.

Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~raoul-snyman/openlp/fix-ftw-download-progress (revision 2811)
https://ci.openlp.io/job/Branch-01-Pull/2430/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2331/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/125/ [SUCCESS]
https:/...

2810. By Phill on 2018-01-24

Started work on storing path objects in service file.
Refactored save code and reduced duplication.
Fixed + improved the loading / saving progress bars
improved performance

loading powerpoint from a service still does work

--------------------------------------------------------------------------------
lp:~phill-ridout/openlp/pathlib12 (revision 2817)
https://ci.openlp.io/job/Branch-01-Pull/2428/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linu...