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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.4 at revision 2637

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

2637. By Raoul Snyman on 2016-06-08

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

2636. By Tim Bentley on 2016-05-26

Translations

2635. By Tomas Groth on 2016-05-24

Fix of tracback during SongPro import. Fixes bug 1582152.
Backport of song-search-fix from trunk
Added support for using the new mutool in mudraw mode
Fix crosswalk bible list download
Fix traceback if bible list download fails.

2634. By Tim Bentley on 2016-05-24

Fix Android SSL
Fix Service Manager
Fix Formatting Tags
Add test

2633. By Tomas Groth on 2016-05-24

pep8 fixes

2632. By Raoul Snyman on 2016-05-13

Fix the Transifex API URL

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/transifex-api-2.4 (revision 2632)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1536/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1447/
[FAILURE] https://ci.openlp.io/job/Branch-03-Interface-Tests/1385/

2631. By Raoul Snyman on 2016-05-12

"Fix the Transifex API URL

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/transifex-api-2.4 (revision 2632)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1536/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1447/
[FAILURE] https://ci.openlp.io/job/Branch-03-Interface-Tests/1385/"

2630. By Raoul Snyman on 2016-04-30

Release 2.4.1

2629. By Raoul Snyman on 2016-04-29

Show a message asking the user if they want to remove a file that doesn't exist

2628. By Samuel Mehrbrodt on 2016-04-29

Fix performance regression with Songbook search

The problem was that in each iteration the database was accessed (the song object).
Fixed this by loading all neccessary information directly in the query.

Also this reintroduces natural sorting.