lp://qastaging/~raoul-snyman/openlp/bug-1589815

Branch merges

Propose for merging

No branches dependent on this one.

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

Tim Bentley: Approve on 2016-06-14

Diff: 182 lines (+106/-5)

6 files modified

openlp/plugins/songs/lib/importers/opensong.py (+1/-1)
tests/functional/openlp_plugins/songs/test_opensongimport.py (+4/-2)
tests/helpers/songfileimport.py (+2/-1)
tests/resources/opensongsongs/Amazing Grace (+1/-1)
tests/resources/opensongsongs/Amazing Grace with bad CCLI (+56/-0)
tests/resources/opensongsongs/Amazing Grace without CCLI.json (+42/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2675. By Raoul Snyman on 2016-06-07

Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left.

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..."

2670. By Ken Roberts on 2016-05-31

"Convert strings from python2 to python3 in plugins part 3

- Convert strings in plugins/remote
- Convert strings in plugins/songs
- Update projectordb test
- Fix oops in format tag - missed escaping brace(s)

--------------------------------
lp:~alisonken1/openlp/strings-plugins3 (revision 2670)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1576/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1487/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1425/
[SUCCESS]..."

2669. By Tim Bentley on 2016-05-31

"Fix formatting tags
Move SpellTextEdit as missed
Add working flags API's to registry

lp:~trb143/openlp/may_fixes (revision 2673)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1574/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1485/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1423/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1202/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/792/
[SUCCESS] https://ci.o..."

2668. By Ken Roberts on 2016-05-24

Convert strings in plugins part 2

- Convert strings in custom
- Convert strings in images
- Convert strings in media
- Convert strings in presentations
- Update projector-pjlink test

--------------------------------
lp:~alisonken1/openlp/strings-plugins2 (revision 2667)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1571/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1482/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1420/
[SUCCESS] https://ci.openlp.io/jo...

2667. By Ken Roberts on 2016-05-24

Update strings to python3 format in plugins part 1

- Convert strings in alert plugin
- Convert strings in bible plugin
- Update bible plugin test
- Update projectordb test

--------------------------------
lp:~alisonken1/openlp/strings-plugins1 (revision 2667)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1570/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1481/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1419/
[SUCCESS] https://ci.openlp.io/job/Branch-04...

2666. By Ken Roberts on 2016-05-20

"- Convert strings in openlp/core/ui files
- Updated projectordb test

--------------------------------
lp:~alisonken1/openlp/strings-core-ui (revision 2667)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1566/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1477/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1415/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1195/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/78..."