lp:~phill-ridout/openlp/pathlib9

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2786

Tim Bentley: Approve on 2017-11-15

Raoul Snyman: Approve on 2017-11-15

Diff: 2016 lines (+307/-416)

19 files modified

openlp/plugins/bibles/forms/bibleimportform.py (+98/-188)
openlp/plugins/bibles/lib/bibleimport.py (+14/-14)
openlp/plugins/bibles/lib/biblestab.py (+2/-2)
openlp/plugins/bibles/lib/db.py (+18/-16)
openlp/plugins/bibles/lib/importers/__init__.py (+0/-21)
openlp/plugins/bibles/lib/importers/csvbible.py (+12/-11)
openlp/plugins/bibles/lib/importers/opensong.py (+6/-5)
openlp/plugins/bibles/lib/importers/osis.py (+4/-4)
openlp/plugins/bibles/lib/importers/sword.py (+1/-1)
openlp/plugins/bibles/lib/importers/wordproject.py (+11/-16)
openlp/plugins/bibles/lib/importers/zefania.py (+4/-4)
openlp/plugins/bibles/lib/manager.py (+9/-10)
tests/functional/openlp_plugins/bibles/test_bibleimport.py (+24/-23)
tests/functional/openlp_plugins/bibles/test_csvimport.py (+29/-20)
tests/functional/openlp_plugins/bibles/test_opensongimport.py (+18/-17)
tests/functional/openlp_plugins/bibles/test_osisimport.py (+26/-25)
tests/functional/openlp_plugins/bibles/test_swordimport.py (+2/-2)
tests/functional/openlp_plugins/bibles/test_wordprojectimport.py (+23/-32)
tests/functional/openlp_plugins/bibles/test_zefaniaimport.py (+6/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2783. By Phill on 2017-11-11

test fix

2782. By Phill on 2017-11-11

head

2781. By Phill on 2017-11-11

HEAD

2780. By Phill on 2017-11-06

Head

2779. By Phill on 2017-10-10

test fixes

2778. By Phill on 2017-10-10

head

2777. By Phill on 2017-10-10

bible pathlib changes

2776. By Phill on 2017-10-01

Regen resources to remove old qr codes and add new qr code

2775. By Phill on 2017-10-01

Removed one qr code from the remotes tab and made the other point to the openlp website mobile downloads so that:
* Remote tab is less cluttered
* Future proof updates, these only need to be made on the website, meaning that older versions of openlp will not break
* Offer android users the option to use f-store (rather than automatically being sent to the play store)

--------------------------------
lp:~phill-ridout/openlp/qr (revision 2770)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/...

2774. By Phill on 2017-10-01

Pathlib changes for the song plugin

lp:~phill-ridout/openlp/pathlib8 (revision 2777)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2230/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2133/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/2015/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1380/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1207/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/337/
[FAILURE] https://ci.o...