lp:~raoul-snyman/openlp/fix-author-type-2.4

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.4 at revision 2680

Tim Bentley: Approve on 2017-03-28

Tomas Groth: Approve on 2017-03-28

Diff: 172 lines (+85/-11)

6 files modified

openlp/core/ui/slidecontroller.py (+3/-1)
openlp/plugins/songs/lib/importers/openlp.py (+6/-6)
tests/functional/openlp_core/test_init.py (+72/-0)
tests/functional/openlp_core_ui/test_slidecontroller.py (+1/-1)
tests/functional/openlp_plugins/songs/test_openlpimporter.py (+2/-2)
tests/resources/opensongsongs/Amazing Grace.json (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1652004: OpenLP Importer 2 does not support author types

Low

Fix Committed

Link a bug report

Related blueprints

2681. By Raoul Snyman on 2017-03-28

Add a test

2680. By Raoul Snyman on 2017-03-28

Fix one test and remove another that wasn't going to ever work

2679. By Raoul Snyman on 2017-03-28

Fix the author_type import properly

2678. By Tim Bentley on 2017-03-25

Next set of translations

2677. By Raoul Snyman on 2017-03-22

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 anymore

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-db-upgrade-2.4 (revision 2681)
[...

2676. By Raoul Snyman on 2017-03-12

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 on 2017-03-02

- 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 on 2017-03-02

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 on 2017-03-02

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...

2672. By Raoul Snyman on 2017-02-03

Release 2.4.5