lp:~raoul-snyman/openlp/re-enable-version-checking-2.4
- Get this branch:
- bzr branch lp:~raoul-snyman/openlp/re-enable-version-checking-2.4
Branch merges
- Tim Bentley: Approve
- Tomas Groth: Approve
-
Diff: 21749 lines (+11719/-7957)8 files modifiedopenlp/core/ui/generaltab.py (+0/-1)
openlp/plugins/remotes/html/jquery.js (+9265/-7661)
openlp/plugins/remotes/html/jquery.min.js (+5/-4)
openlp/plugins/remotes/html/jquery.mobile.css (+2332/-0)
openlp/plugins/remotes/html/jquery.mobile.js (+92/-287)
openlp/plugins/remotes/html/jquery.mobile.min.css (+2/-2)
openlp/plugins/remotes/html/jquery.mobile.min.js (+2/-2)
tests/functional/openlp_core_ui_media/test_systemplayer.py (+21/-0)
- OpenLP Core: Pending requested
-
Diff: 136316 lines (+115449/-3468) (has conflicts)88 files modified.bzrignore (+4/-0)
openlp/.version (+1/-1)
openlp/core/__init__.py (+4/-4)
openlp/core/common/__init__.py (+6/-0)
openlp/core/lib/projector/constants.py (+64/-0)
openlp/core/lib/projector/pjlink1.py (+67/-1)
openlp/core/lib/spelltextedit.py.OTHER (+204/-0)
openlp/core/resources.py (+85536/-105)
openlp/core/ui/exceptionform.py (+7/-0)
openlp/core/ui/generaltab.py (+0/-1)
openlp/core/ui/media/systemplayer.py (+35/-2)
openlp/core/ui/projector/manager.py (+65/-2)
openlp/core/ui/projector/sourceselectform.py (+62/-1)
openlp/core/utils/__init__.py.OTHER (+543/-0)
openlp/core/utils/actions.py.OTHER (+388/-0)
openlp/plugins/bibles/lib/importers/http.py (+11/-1)
openlp/plugins/bibles/lib/importers/zefania.py (+11/-0)
openlp/plugins/bibles/lib/mediaitem.py (+8/-0)
openlp/plugins/presentations/lib/pdfcontroller.py (+31/-0)
openlp/plugins/remotes/html/jquery.js.OTHER (+11008/-0)
openlp/plugins/remotes/html/jquery.min.js.OTHER (+5/-0)
openlp/plugins/remotes/html/jquery.mobile.css (+2332/-0)
openlp/plugins/remotes/html/jquery.mobile.js.OTHER (+9162/-0)
openlp/plugins/remotes/html/jquery.mobile.min.css.OTHER (+2/-0)
openlp/plugins/remotes/html/jquery.mobile.min.js.OTHER (+2/-0)
openlp/plugins/remotes/lib/remotetab.py (+12/-0)
openlp/plugins/songs/forms/editsongform.py (+16/-1)
openlp/plugins/songs/lib/__init__.py (+8/-2)
openlp/plugins/songs/lib/db.py (+2/-2)
openlp/plugins/songs/lib/importers/easyworship.py (+32/-0)
openlp/plugins/songs/lib/importers/mediashout.py (+8/-1)
openlp/plugins/songs/lib/importers/openlp.py (+5/-0)
openlp/plugins/songs/lib/importers/songimport.py (+5/-2)
openlp/plugins/songs/lib/importers/videopsalm.py (+6/-0)
openlp/plugins/songs/lib/mediaitem.py (+26/-0)
openlp/plugins/songs/lib/songselect.py (+59/-2)
resources/i18n/af.ts (+92/-70)
resources/i18n/bg.ts (+113/-91)
resources/i18n/cs.ts (+93/-69)
resources/i18n/da.ts (+91/-69)
resources/i18n/de.ts (+94/-70)
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 (+253/-229)
resources/i18n/id.ts (+92/-68)
resources/i18n/ja.ts (+90/-68)
resources/i18n/ko.ts (+372/-335)
resources/i18n/lt.ts (+689/-650)
resources/i18n/nb.ts (+95/-71)
resources/i18n/nl.ts (+92/-68)
resources/i18n/pl.ts (+187/-149)
resources/i18n/pt_BR.ts (+303/-268)
resources/i18n/ru.ts (+90/-68)
resources/i18n/sk.ts (+95/-71)
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_common/test_projector_utilities.py (+4/-0)
tests/functional/openlp_core_common/test_registryproperties.py (+31/-1)
tests/functional/openlp_core_lib/test_htmlbuilder.py (+25/-0)
tests/functional/openlp_core_lib/test_projector_pjlink1.py (+345/-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_servicemanager.py (+140/-11)
tests/functional/openlp_core_ui/test_themetab.py (+84/-0)
tests/functional/openlp_core_ui_media/test_systemplayer.py (+499/-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/functional/openlp_plugins/songs/test_songselect.py (+7/-0)
tests/interfaces/openlp_core_lib/test_pluginmanager.py (+10/-0)
tests/interfaces/openlp_plugins/custom/forms/test_customform.py (+19/-0)
tests/resources/opensongsongs/Amazing Grace with bad CCLI (+56/-0)
tests/resources/opensongsongs/Amazing Grace without CCLI.json (+42/-0)
tests/resources/songshowplussongs/cleanse-me.json (+38/-0)
tests/resources/videopsalmsongs/as-safe-a-stronghold2.json (+35/-0)
tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold2.json (+47/-0)
tests/utils/test_bzr_tags.py (+1/-1)
Branch information
Recent revisions
- 2653. By Tomas Groth
-
Fixes getting bible texts from CrossWalk
Fix to handling of form feed char and vertical tab char. - 2651. By Raoul Snyman
-
Fix bug #1547964 by ignoring the exception (it's harmless)
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/disconnect-slots-2.4 (revision 2652)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1741/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1652/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1590/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1346/
[SUCCESS] https://ci.openlp. io/job/ Branch... - 2649. By Tim Bentley
-
Fix bug and fully test it.
lp:~trb143/openlp/themecombo-24 (revision 2649)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1730/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1641/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1579/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1339/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Tests/929/
[SUCCESS] https://ci.openlp. io/job/ Branch- 05a-Code_ Analysis/ 997/
[SUCCESS] htt... - 2648. By Raoul Snyman
-
Fix SongSelect.
Do updated tests count?
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/bug-1608194-2.4 (revision 2650)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1724/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1635/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1573/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1334/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ T... - 2647. By Raoul Snyman
-
Update slot signatures to comply with PyQt5.6's stricter checks.
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/stricter-slot-signatures-2.4 (revision 2649)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1722/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1633/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1571/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1332/
[SUCCESS] https://ci.openlp....
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openlp