lp:~trb143/openlp/bug-1516171-24

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2567

Tomas Groth: Approve on 2015-11-16

Diff: 132 lines (+110/-1)

3 files modified

openlp/plugins/alerts/lib/alertsmanager.py (+5/-1)
tests/functional/openlp_plugins/alerts/__init__.py (+21/-0)
tests/functional/openlp_plugins/alerts/test_manager.py (+84/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1516171: Alert with line break from remote makes desktop report a bug

Medium

Fix Released

Link a bug report

Related blueprints

2567. By Tim Bentley on 2015-11-15

fix remote call data

2566. By Tim Bentley on 2015-11-05

First merge for 2.4.

A Number of small bug fixes which could be done in 2.2.
Clean up all the 2.0 to 2.2 migrations stuff.
Create a 2.2 to 2.4 migration for settings.
Fix problems with the Tag test so you do not need to restart a branch each time we do a release.

lp:~trb143/openlp/bugs-2_4b (revision 2578)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1164/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1087/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1028/...

2565. By Tim Bentley on 2015-11-04

Fix the pep 8 text.

lp:~trb143/openlp/bug-about (revision 2566)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1170/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1093/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1034/
[SUCCESS] https//ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/881/
[SUCCESS] https//ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/477/
[SUCCESS] https//ci.openlp.io/job/Branch-05a-Code_Analysis/597/
[SUCCESS] https//ci.openlp.io/j...

2564. By Tomas Groth on 2015-11-02

Made ZionWorx importer work under python3, fixes bug 1510282.
Improved WorshipCenter Pro import, support more fields and verse types.

2563. By Tim Bentley on 2015-11-02

Refactor the about dialog so it is not possible for translators to break OpenLP.

2562. By Tim Bentley on 2015-10-17

Release 2.2

2561. By Tim Bentley on 2015-10-16

Fixed translations by removing ../../

Last set of translations before 2.2 this weekend.

2560. By Tomas Groth on 2015-10-15

Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows.

2559. By Raoul Snyman on 2015-10-14

"Let's download things once only, instead of 3 times."

2558. By Tomas Groth on 2015-10-13

Make 2 texts translatable.
Remove unneeded quotes from commit message in the merge-script.