lp:~tomasgroth/openlp/song-import-fixes25
- Get this branch:
- bzr branch lp:~tomasgroth/openlp/song-import-fixes25
Branch merges
- Tim Bentley: Approve
-
Diff: 311 lines (+130/-29)9 files modifiedopenlp/plugins/songs/lib/__init__.py (+2/-2)
openlp/plugins/songs/lib/importers/easyslides.py (+12/-12)
openlp/plugins/songs/lib/importers/songbeamer.py (+9/-6)
openlp/plugins/songs/lib/importers/videopsalm.py (+4/-2)
tests/functional/openlp_plugins/songs/test_easyslidesimport.py (+2/-0)
tests/resources/easyslidessongs/Amazing Grace.json (+6/-6)
tests/resources/easyslidessongs/Export_2017-01-12_BB.json (+44/-0)
tests/resources/easyslidessongs/Export_2017-01-12_BB.xml (+50/-0)
tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold.json (+1/-1)
Related bugs
Bug #1530597: Importing Songbeamer songs using latin1 encoding doesn't get decoded correctly | Low | Fix Committed | |
Bug #1652851: VideoPsalm import fails due to unexpected format | Medium | Fix Committed | |
Bug #1655985: EasySlide importer gets the verse order wrong | Low | Fix Committed | |
Bug #1655988: Formatting tags gets included in searchable lyric text | High | Fix Committed |
Related blueprints
Branch information
Recent revisions
- 2713. By Tim Bentley
-
Move some http code around to allow it to be reused in the remote updates.
lp:~trb143/openlp/httpfixes (revision 2718)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1888/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1799/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1738/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1474/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Tests/1064/
[SUCCESS] https://ci.openlp. io/jo... - 2712. By Tomas Groth
-
Update to the appveyor integration script to work with the new packaging builder.
- 2711. By Raoul Snyman
-
Fix segfault on click on a spinner on macOS
Fix spurious traceback on some platforms or configurations of media players
Make the tab style affect only the media library tabs, not everything else too
Hide the splash screen when the backup dialog shows and when the exception form showsAdd this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/mac-niggles (revision 2713)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1873/
[SUCCESS] https://ci.openlp. io/job/ B... - 2710. By Raoul Snyman
-
Fix bug #1642684 by removing the blank item and clearing the text box instead.
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/bug-1642684 (revision 2710)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1869/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1780/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1718/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1458/
[SUCCESS] https://ci.openlp. io/... - 2709. By Raoul Snyman
-
Woo! Brand new OpenLP look and feel!
Unfortunately, the Crosswalk servers seem a little dodgy at the moment.
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/new-branding (revision 2703)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1862/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1773/
[FAILURE] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1711/
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openlp