lp:~tomasgroth/openlp/24bugfix-backport3
- Get this branch:
- bzr branch lp:~tomasgroth/openlp/24bugfix-backport3
Branch merges
- Raoul Snyman: Approve
-
Diff: 134 lines (+60/-6)6 files modifiedopenlp/plugins/songs/lib/importers/mediashout.py (+5/-3)
openlp/plugins/songs/lib/importers/presentationmanager.py (+7/-1)
openlp/plugins/songs/lib/importers/songshowplus.py (+7/-1)
openlp/plugins/songs/lib/importers/videopsalm.py (+1/-1)
tests/functional/openlp_plugins/songs/test_songshowplusimport.py (+2/-0)
tests/resources/songshowplussongs/cleanse-me.json (+38/-0)
- OpenLP Core: Pending requested
-
Diff: 120157 lines (+92605/-12402) (has conflicts)60 files modifiedopenlp/.version (+1/-1)
openlp/core/__init__.py (+4/-4)
openlp/core/lib/projector/pjlink1.py (+27/-0)
openlp/core/lib/spelltextedit.py.OTHER (+204/-0)
openlp/core/resources.py (+87433/-9326)
openlp/core/ui/exceptionform.py (+7/-0)
openlp/core/ui/servicemanager.py (+7/-0)
openlp/core/utils/__init__.py.OTHER (+543/-0)
openlp/plugins/bibles/lib/mediaitem.py (+8/-0)
openlp/plugins/presentations/lib/pdfcontroller.py (+22/-0)
openlp/plugins/remotes/lib/remotetab.py (+12/-0)
openlp/plugins/songs/forms/editsongform.py (+16/-1)
openlp/plugins/songs/lib/importers/easyworship.py (+32/-0)
openlp/plugins/songs/lib/importers/mediashout.py (+7/-0)
openlp/plugins/songs/lib/importers/openlp.py (+5/-0)
openlp/plugins/songs/lib/importers/videopsalm.py (+6/-0)
openlp/plugins/songs/lib/mediaitem.py (+26/-0)
resources/i18n/af.ts (+90/-68)
resources/i18n/bg.ts (+113/-91)
resources/i18n/cs.ts (+93/-69)
resources/i18n/da.ts (+91/-69)
resources/i18n/de.ts (+93/-69)
resources/i18n/el.ts (+90/-68)
resources/i18n/en.ts (+92/-68)
resources/i18n/en_GB.ts (+92/-68)
resources/i18n/en_ZA.ts (+90/-68)
resources/i18n/es.ts (+113/-89)
resources/i18n/et.ts (+90/-68)
resources/i18n/fi.ts (+104/-76)
resources/i18n/fr.ts (+90/-68)
resources/i18n/hu.ts (+93/-69)
resources/i18n/id.ts (+90/-68)
resources/i18n/ja.ts (+90/-68)
resources/i18n/ko.ts (+372/-335)
resources/i18n/lt.ts (+688/-649)
resources/i18n/nb.ts (+95/-71)
resources/i18n/nl.ts (+90/-68)
resources/i18n/pl.ts (+90/-68)
resources/i18n/pt_BR.ts (+292/-257)
resources/i18n/ru.ts (+90/-68)
resources/i18n/sk.ts (+93/-69)
resources/i18n/sv.ts (+90/-68)
resources/i18n/ta_LK.ts (+90/-68)
resources/i18n/th_TH.ts (+90/-68)
resources/i18n/zh_CN.ts (+90/-68)
resources/i18n/zh_TW.ts (+90/-68)
scripts/translation_utils.py (+4/-0)
tests/functional/openlp_core_lib/test_htmlbuilder.py (+25/-0)
tests/functional/openlp_core_lib/test_projector_pjlink1.py (+17/-0)
tests/functional/openlp_core_ui/test_firsttimeform.py (+20/-0)
tests/functional/openlp_core_ui/test_generaltab.py (+54/-0)
tests/functional/openlp_core_ui/test_themetab.py (+84/-0)
tests/functional/openlp_plugins/presentations/test_pdfcontroller.py (+74/-0)
tests/functional/openlp_plugins/remotes/test_router.py (+23/-0)
tests/functional/openlp_plugins/songs/test_lib.py (+27/-0)
tests/functional/openlp_plugins/songs/test_openlpimporter.py (+75/-0)
tests/interfaces/openlp_core_lib/test_pluginmanager.py (+10/-0)
tests/interfaces/openlp_plugins/custom/forms/test_customform.py (+19/-0)
tests/resources/songshowplussongs/cleanse-me.json (+38/-0)
tests/utils/test_bzr_tags.py (+1/-1)
Related bugs
Bug #1585489: Traceback during songshowplus import | Medium | Fix Committed | |
Bug #1590657: MediaShout import causes traceback | Medium | Fix Released |
Related blueprints
Branch information
Recent revisions
- 2638. By Tomas Groth
-
Fix MediaShout import issue when an expected table is missing. Fixes bug 1590657.
- 2635. By Tomas Groth
-
Fix of tracback during SongPro import. Fixes bug 1582152.
Backport of song-search-fix from trunk
Added support for using the new mutool in mudraw mode
Fix crosswalk bible list download
Fix traceback if bible list download fails. - 2632. By Raoul Snyman
-
Fix the Transifex API URL
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/transifex-api-2.4 (revision 2632)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1536/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1447/
[FAILURE] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1385/ - 2631. By Raoul Snyman
-
"Fix the Transifex API URL
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/transifex-api-2.4 (revision 2632)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1536/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1447/
[FAILURE] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1385/"
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openlp