Merge lp:~tomasgroth/openlp/bugfixes12 into lp:openlp
Proposed by
Tomas Groth
Status: | Merged |
---|---|
Approved by: | Raoul Snyman |
Approved revision: | 2497 |
Merged at revision: | 2495 |
Proposed branch: | lp:~tomasgroth/openlp/bugfixes12 |
Merge into: | lp:openlp |
Diff against target: |
214 lines (+77/-7) 8 files modified
openlp/core/ui/firsttimeform.py (+13/-0) openlp/core/ui/firsttimewizard.py (+4/-1) openlp/plugins/bibles/lib/__init__.py (+3/-3) openlp/plugins/presentations/lib/mediaitem.py (+1/-1) openlp/plugins/songs/lib/importers/presentationmanager.py (+15/-2) tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py (+2/-0) tests/interfaces/openlp_plugins/bibles/test_lib_parse_reference.py (+10/-0) tests/resources/presentationmanagersongs/Amazing Grace.json (+29/-0) |
To merge this branch: | bzr merge lp:~tomasgroth/openlp/bugfixes12 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Tim Bentley | Approve | ||
Review via email:
|
Description of the change
Make xml parsing of presentation manager files recover if errors are encountered. Fixes bug 1414980.
Set the cursor back to normal after deleting a presentation. Fixes bug 1414978.
Added a cancel-button to FTW when no internet is available. Fixes bug 1410738
Fix support for 'end' mark in bible-search. Fixes bug 1412517.
To post a comment you must log in.
lp:~tomasgroth/openlp/bugfixes12 (revision 2497) ci.openlp. org/job/ Branch- 01-Pull/ 927/ ci.openlp. org/job/ Branch- 02-Functional- Tests/853/ ci.openlp. org/job/ Branch- 03-Interface- Tests/798/ ci.openlp. org/job/ Branch- 04a-Windows_ Functional_ Tests/709/ ci.openlp. org/job/ Branch- 04b-Windows_ Interface_ Tests/308/ ci.openlp. org/job/ Branch- 05a-Code_ Analysis/ 446/ ci.openlp. org/job/ Branch- 05b-Test_ Coverage/ 317/
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://