lp://qastaging/~suutari-olli/openlp/add-bible-license-field

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/openlp at revision 2716

Raoul Snyman: Approve on 2017-01-17

Tim Bentley: Approve on 2017-01-08

Diff: 400 lines (+125/-23)

9 files modified

openlp/core/common/uistrings.py (+10/-7)
openlp/plugins/bibles/forms/bibleimportform.py (+17/-2)
openlp/plugins/bibles/forms/editbibledialog.py (+7/-0)
openlp/plugins/bibles/forms/editbibleform.py (+23/-4)
openlp/plugins/bibles/lib/manager.py (+5/-5)
openlp/plugins/songs/lib/mediaitem.py (+7/-2)
openlp/plugins/songs/lib/songstab.py (+13/-1)
openlp/plugins/songs/songsplugin.py (+1/-0)
tests/functional/openlp_plugins/songs/test_mediaitem.py (+42/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1557579: Make the song-footer text "Written by" optional	Wishlist	Fix Committed
Bug #1623631: Add "Full License" field for Bibles	Wishlist	Fix Committed

Link a bug report

Related blueprints

2714. By Azaziah on 2017-01-08

- Merged trunk on 8.1.17

2713. By Azaziah on 2016-12-23

- Merged trunk on 23.12.16

2712. By Azaziah on 2016-12-18

- Changed one pair of " to '
- Changed the code for checking Bible meta exists
- Changed the default value for the new setting to "True"

2711. By Azaziah on 2016-12-04

- Removed 1 "å" that had slipped in to the code.

2710. By Azaziah on 2016-12-04

- Added a test for checking hidden "Written by" text.

2709. By Azaziah on 2016-12-03

- Turned the one try statement into multiple so the existing data could be loaded if some fields were missing.

2708. By Azaziah on 2016-12-03

- Merged trunk on 4.12.16

2707. By Azaziah on 2016-09-18

- Fixed the test

2706. By Azaziah on 2016-09-16

- pep8

2705. By Azaziah on 2016-09-16

- Added the placeholder texts to uistrings
- Added placeholder texts for Bible importer & Edit.