← Back to branch summary

~suutari-olli/openlp/click-slide-to-go-live-from-blank

~suutari-olli/openlp/click-slide-to-go-live-from-blank

Viewing all changes in revision 2652.

Committer: suutari-olli
Date: 2016-06-26 23:23:50 UTC
mfrom: (2625.1.52 openlp)
Revision ID: suutari.olli@gmail.com-20160626232350-8h66xea3ah4jovmg

- Merged trunk on 27.6.16

files added:
tests/resources/opensongsongs/Amazing Grace with bad CCLI

tests/resources/opensongsongs/Amazing Grace without CCLI.json

tests/resources/songshowplussongs/cleanse-me.json

tests/resources/songshowplussongs/cleanse-me.sbsong

files modified:
openlp/core/lib/htmlbuilder.py

openlp/core/ui/firsttimeform.py

openlp/plugins/bibles/forms/editbibledialog.py

openlp/plugins/songs/lib/importers/mediashout.py

openlp/plugins/songs/lib/importers/opensong.py

openlp/plugins/songs/lib/importers/opspro.py

openlp/plugins/songs/lib/importers/presentationmanager.py

openlp/plugins/songs/lib/importers/songpro.py

openlp/plugins/songs/lib/importers/songshowplus.py

openlp/plugins/songs/lib/importers/videopsalm.py

openlp/plugins/songs/lib/importers/worshipcenterpro.py

openlp/plugins/songs/lib/mediaitem.py

tests/functional/openlp_core_lib/test_htmlbuilder.py

tests/functional/openlp_plugins/songs/test_opensongimport.py

tests/functional/openlp_plugins/songs/test_songshowplusimport.py

tests/helpers/songfileimport.py

tests/resources/opensongsongs/Amazing Grace

Show diffs side-by-side

added added

removed removed

openlp/core/lib/htmlbuilder.py

openlp/core/ui/firsttimeform.py

openlp/plugins/bibles/forms/editbibledialog.py

openlp/plugins/songs/lib/importers/mediashout.py

openlp/plugins/songs/lib/importers/opensong.py

openlp/plugins/songs/lib/importers/opspro.py

openlp/plugins/songs/lib/importers/presentationmanager.py

openlp/plugins/songs/lib/importers/songpro.py

openlp/plugins/songs/lib/importers/songshowplus.py

openlp/plugins/songs/lib/importers/videopsalm.py

openlp/plugins/songs/lib/importers/worshipcenterpro.py

openlp/plugins/songs/lib/mediaitem.py

tests/functional/openlp_core_lib/test_htmlbuilder.py

tests/functional/openlp_plugins/songs/test_opensongimport.py

tests/functional/openlp_plugins/songs/test_songshowplusimport.py

tests/helpers/songfileimport.py

tests/resources/opensongsongs/Amazing Grace

tests/resources/opensongsongs/Amazing Grace with bad CCLI

tests/resources/opensongsongs/Amazing Grace without CCLI.json

tests/resources/songshowplussongs/cleanse-me.json

tests/resources/songshowplussongs/cleanse-me.sbsong

Older »