lp:~raoul-snyman/openlp/db-upgrades-2.6

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2728

Tim Bentley: Approve on 2017-03-23

Diff: 1227 lines (+699/-184)

14 files modified

CHANGELOG.rst (+11/-0)
openlp/core/__init__.py (+1/-1)
openlp/core/ui/maindisplay.py (+1/-1)
openlp/core/ui/mainwindow.py (+5/-3)
openlp/plugins/songs/lib/importers/openlp.py (+42/-6)
openlp/plugins/songs/lib/importers/presentationmanager.py (+28/-10)
openlp/plugins/songs/lib/songselect.py (+16/-3)
openlp/plugins/songs/lib/upgrade.py (+56/-44)
scripts/lp-merge.py (+161/-89)
tests/functional/openlp_core/test_init.py (+35/-9)
tests/functional/openlp_plugins/remotes/test_router.py (+1/-5)
tests/functional/openlp_plugins/songs/test_songselect.py (+41/-6)
tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py (+9/-7)
tests/interfaces/openlp_plugins/songs/forms/test_songmaintenanceform.py (+292/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2737. By Raoul Snyman on 2017-03-23

Changed to use plain old SQL

2736. By Raoul Snyman on 2017-03-23

Fix up a linting issue and removed and unused import in lp-merge.py

2735. By Raoul Snyman on 2017-03-23

Update changelog

2734. By Raoul Snyman on 2017-03-23

Removed some unnecessary comments; Updated changelog

2733. By Raoul Snyman on 2017-03-23

Various fixes:
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- 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
- Fix song database upgrades by moving upgrades 4 and 5 into 6 and writing some damage control
- Add a CHANGELOG.rst file

2732. By Raoul Snyman on 2017-03-22

Pull in refactored merge script

2731. By Raoul Snyman on 2017-03-22

Cleanup BibleImportForm tests

2730. By Raoul Snyman on 2017-03-10

Fix a test that was causing a segfault

2729. By Raoul Snyman on 2017-03-10

Ignore a test that is causing a segfault

2728. By Raoul Snyman on 2017-03-10

Fix up two tests