Merge lp:~tomasgroth/openlp/bugfixes18 into lp:openlp
Proposed by
Tomas Groth
Status: | Merged |
---|---|
Approved by: | Raoul Snyman |
Approved revision: | 2529 |
Merged at revision: | 2526 |
Proposed branch: | lp:~tomasgroth/openlp/bugfixes18 |
Merge into: | lp:openlp |
Diff against target: |
206 lines (+53/-13) 9 files modified
openlp/core/common/__init__.py (+3/-2) openlp/core/lib/__init__.py (+1/-1) openlp/core/ui/maindisplay.py (+2/-2) openlp/core/ui/media/mediacontroller.py (+2/-0) openlp/core/ui/thememanager.py (+9/-5) openlp/plugins/custom/lib/mediaitem.py (+4/-0) openlp/plugins/songs/lib/openlyricsxml.py (+2/-2) tests/functional/openlp_core_lib/test_lib.py (+1/-1) tests/functional/openlp_core_ui/test_thememanager.py (+29/-0) |
To merge this branch: | bzr merge lp:~tomasgroth/openlp/bugfixes18 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Tim Bentley | Approve | ||
Review via email: mp+255147@code.launchpad.net |
Description of the change
Mark a custom slide edited from preview as coming from plugin. Fixes bug 1439671.
Use html.escape instead of the deprecated cgi.escape
Fix support for special characters in theme names. Fixes bug 1438563.
Fix another case of traceback when playing media with no players available/enabled (bug 1422761).
To post a comment you must log in.
lp:~tomasgroth/openlp/bugfixes18 (revision 2529) ci.openlp. io/job/ Branch- 01-Pull/ 1003/ ci.openlp. io/job/ Branch- 02-Functional- Tests/926/ ci.openlp. io/job/ Branch- 03-Interface- Tests/868/ ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/758/ ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Tests/356/ ci.openlp. io/job/ Branch- 05a-Code_ Analysis/ 490/ ci.openlp. io/job/ Branch- 05b-Test_ Coverage/ 361/
[SUCCESS] https//
[SUCCESS] https//
[SUCCESS] https//
[SUCCESS] https//
[SUCCESS] https//
[SUCCESS] https//
[SUCCESS] https//