lp:~raoul-snyman/openlp/fix-author_type

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2730

Tim Bentley: Approve on 2017-03-28

Tomas Groth: Approve on 2017-03-28

Diff: 160 lines (+81/-11)

4 files modified

openlp/core/ui/slidecontroller.py (+2/-1)
openlp/plugins/songs/lib/importers/openlp.py (+6/-6)
tests/functional/openlp_core/test_init.py (+72/-3)
tests/functional/openlp_core_ui/test_slidecontroller.py (+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

2731. By Raoul Snyman on 2017-03-28

Try to figure out why it segfaults on Jenkins but not on my machine

2730. By Raoul Snyman on 2017-03-28

Try to figure out why it segfaults on Jenkins but not on my machine

2729. By Raoul Snyman on 2017-03-28

Fix the author_type import properly

2728. By Raoul Snyman on 2017-03-25

Various fixes and things:
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
...

2727. By Simon Hanna on 2017-03-13

Minor fix that makes sure that songbeamer files get decoded properly.

2726. By Tim Bentley on 2017-03-04

Will SSL being removed in 2.8 it and not supported in Android and iOS lets prevent it from living in 2.6.
Just removed the SSL code to stop the settings and not start the SSL server full removal will be in 2.8 when we change server infrastructure,
With test this time.

lp:~trb143/openlp/removessl26 (revision 2728)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1921/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1832/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Te...

2725. 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 (revision 2725)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1914/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1825/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1766/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1089/
[...

2724. By Raoul Snyman on 2017-03-02

Fix bug #1668669 by reducing the height of the settings window

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1668669 (revision 2724)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1909/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1820/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1760/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1494/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-W...

2723. By Phill on 2017-02-26

Merge in regenerated resources

2722. By Phill on 2017-02-24

Bible media item refactors.
Added the ability to sort the 'select' aka 'advanced' bible books combo box alphabetically. (note resources will need regen to show the button icon, I'll submit this in another merge proposal to keep this one a tiny bit cleaner.
Lots of Tests!