Merge lp://qastaging/~raoul-snyman/openlp/animated-alerts into lp://qastaging/openlp

Proposed by Raoul Snyman
Status: Superseded
Proposed branch: lp://qastaging/~raoul-snyman/openlp/animated-alerts
Merge into: lp://qastaging/openlp
Diff against target: 1029 lines (+745/-63)
9 files modified
openlp/core/display/html/display.css (+90/-0)
openlp/core/display/html/display.html (+5/-23)
openlp/core/display/html/display.js (+237/-16)
openlp/core/display/webengine.py (+6/-0)
openlp/core/display/window.py (+2/-2)
openlp/plugins/alerts/alertsplugin.py (+3/-1)
openlp/plugins/alerts/lib/alertsmanager.py (+33/-3)
openlp/plugins/alerts/lib/alertstab.py (+69/-17)
tests/js/test_display.js (+300/-1)
To merge this branch: bzr merge lp://qastaging/~raoul-snyman/openlp/animated-alerts
Reviewer Review Type Date Requested Status
OpenLP Core Pending
Review via email: mp+372733@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2019-09-12.

Commit message

Based on ic90's code, this just simplifies some of the code, and streamlines how things work, plus a couple of CSS fixes.

Description of the change

Based on ic90's code, this just simplifies some of the code, and streamlines how things work, plus a couple of CSS fixes.

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

JavaScript tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

macOS tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linting failed, please see https://ci.openlp.io/job/MP-05-Linting/171/ for more details

2890. By Raoul Snyman

Fix a linting issue

2891. By Raoul Snyman

Remove some old, commented out code.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.