Merge lp://qastaging/~ic90/openlp/animated-alerts into lp://qastaging/openlp
Proposed by
Nico Opiyo
Status: | Merged |
---|---|
Merged at revision: | 2904 |
Proposed branch: | lp://qastaging/~ic90/openlp/animated-alerts |
Merge into: | lp://qastaging/openlp |
Diff against target: |
1027 lines (+784/-41) 9 files modified
openlp/core/display/html/display.css (+80/-0) openlp/core/display/html/display.html (+9/-4) openlp/core/display/html/display.js (+240/-13) openlp/core/display/window.py (+3/-2) openlp/plugins/alerts/alertsplugin.py (+3/-1) openlp/plugins/alerts/lib/alertsmanager.py (+33/-3) openlp/plugins/alerts/lib/alertstab.py (+69/-17) package.json (+1/-1) tests/js/test_display.js (+346/-0) |
To merge this branch: | bzr merge lp://qastaging/~ic90/openlp/animated-alerts |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tomas Groth | Needs Fixing | ||
Raoul Snyman | Pending | ||
Nico Opiyo | Pending | ||
Review via email:
|
Commit message
Added scrolling alerts
Description of the change
Refactored the tests and optimized alert display code plus fixed spacing
To post a comment you must log in.
Linux tests passed!