lp:~thelinuxguy/openlp/backport-fix
- Get this branch:
- bzr branch lp:~thelinuxguy/openlp/backport-fix
Branch merges
- Tim Bentley: Approve
- Raoul Snyman: Approve
-
Diff: 76 lines (+32/-3)4 files modifiedopenlp/plugins/songs/lib/importers/songbeamer.py (+2/-3)
tests/functional/openlp_plugins/songs/test_songbeamerimport.py (+7/-0)
tests/resources/songbeamersongs/cp1252song.json (+8/-0)
tests/resources/songbeamersongs/cp1252song.sng (+15/-0)
Branch information
Recent revisions
- 2680. By Raoul Snyman
-
Fix the author_type import properly
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/fix-author-type-2.4 (revision 2681)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1947/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1858/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1799/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1525/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Te... - 2679. By Raoul Snyman
-
Fix a problem with loading Qt's translation files
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/fix-translations-2.4 (revision 2680)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1943/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1854/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1795/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1521/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Windo... - 2677. By Raoul Snyman
-
Revert the database upgrade, fix a few more bugs, and add some tests.
Bugs fixed:
- Sometimes the timer goes off as OpenLP is shutting down, and the application has already been deleted (reported via support system)
- Fix opening the data folder (KDE thought the old way was an SMB share)
- Fix a problem with the new QMediaPlayer not controlling the playlist anymoreAdd this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/fix-db-upgrade-2.4 (revision 2681)
[... - 2676. By Raoul Snyman
-
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/db-upgrades-2.4 (revision 2681)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1929/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1840/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1781/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1511/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Tests/1101/
[SUCCESS] https://ci.openlp. io/... - 2675. By Raoul Snyman
-
- Fix SongSelect so that it detects the login URL
- Fix PresentationManager importer to handle weird XML
- Pull in OpenLP song importer fixes from Olli's branch - 2674. By Raoul Snyman
-
Fix bug #1666005 and bug #1668994
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/off-by-one-2.4 (revision 2676)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1915/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1826/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1767/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1500/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Tests/109... - 2673. By Raoul Snyman
-
Fix bug #1668669 by reducing the height of the widget.
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/bug-1668669-2.4 (revision 2673)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1908/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1819/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1759/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1493/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Windo...
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openlp