Merge lp://qastaging/~phill-ridout/openlp/wow_import_fixes into lp://qastaging/openlp
Proposed by
Phill
| Status: | Superseded | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~phill-ridout/openlp/wow_import_fixes | ||||||||
| Merge into: | lp://qastaging/openlp | ||||||||
| Diff against target: |
759 lines (+468/-101) 13 files modified
openlp/core/common/i18n.py (+2/-1) openlp/core/lib/__init__.py (+54/-1) openlp/core/ui/formattingtagcontroller.py (+1/-1) openlp/core/widgets/edits.py (+1/-1) openlp/plugins/songs/lib/importers/wordsofworship.py (+146/-79) openlp/plugins/songs/lib/openlyricsxml.py (+1/-1) tests/functional/openlp_core/lib/test_lib.py (+180/-2) tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py (+36/-12) tests/resources/songs/wordsofworship/Amazing Grace (6 Verses)_v2_1_2.json (+1/-1) tests/resources/songs/wordsofworship/Holy Holy Holy Lord God Almighty_v2_1_2.json (+1/-1) tests/resources/songs/wordsofworship/Test_Song_v2_0_0.json (+18/-0) tests/resources/songs/wordsofworship/Test_Song_v2_1_2.json (+26/-0) tests/resources/songs/wordsofworship/When morning gilds the skies_v2_0_0.json (+1/-1) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~phill-ridout/openlp/wow_import_fixes | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenLP Core | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2019-06-28.
To post a comment you must log in.
Revision history for this message
| Raoul Snyman (raoul-snyman) wrote | # |
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Linux tests failed, please see https:/