lp:~alisonken1/openlp/strings-templates2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2675

Tim Bentley: Approve on 2016-06-14

Tomas Groth: Approve on 2016-06-09

Diff: 923 lines (+409/-398)

5 files modified

openlp/core/lib/htmlbuilder.py (+224/-226)
openlp/core/ui/firsttimeform.py (+3/-3)
openlp/plugins/bibles/forms/editbibledialog.py (+1/-1)
openlp/plugins/songs/lib/mediaitem.py (+1/-1)
tests/functional/openlp_core_lib/test_htmlbuilder.py (+180/-167)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1590386: Editing and Deleting Bibles is broken	Medium	Fix Committed
Bug #1590475: Songs that have Verse order trigger traceback	Medium	Fix Committed

Link a bug report

Related blueprints

2680. By Ken Roberts on 2016-06-09

String format oops

2679. By Ken Roberts on 2016-06-08

String format oops

2678. By Ken Roberts on 2016-06-08

Oops in string format

2677. By Ken Roberts on 2016-06-07

Remove testing verbosity flag

2676. By Ken Roberts on 2016-06-07

Beauty spa for the htmlbuilder

2675. By Ken Roberts on 2016-06-06

Convert htmlbuilder strings to Template()

2674. By Ian Knight on 2016-06-05

Adds automatic functionality to the max-height for non-text items feature, and sets this as the default value.
Advanced tab spin box replaced with combo box.

Test coverage expanded on other functions in listpreviewwidget and pep8 errors fixed.
Fixed test naming.
Merged with trunk as of 2016-06-02_10:30.

lp:~knightrider0xd/openlp/non-text-item-height-default (revision 2674)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1584/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1...

2673. By Raoul Snyman on 2016-06-02

Make all our tests nose2 compatible. They still all work with nose1 (and now a few methods that weren't actually tests don't run).

2672. By Raoul Snyman on 2016-05-31

Fix formatting issues. See https://code.launchpad.net/~knightrider0xd/openlp/non-text-item-height-default/+merge/295318/comments/758254

2671. By Ken Roberts on 2016-05-31

"Convert strings to python3 in plugins part 4

- Convert strings in plugins/songusage
- Convert missed string in projector/pjlink1
- Updated projectorpjlink1 test

--------------------------------
lp:~alisonken1/openlp/strings-plugins4 (revision 2670)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1578/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1489/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1427/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_F..."