lp:~tomasgroth/openlp/25bugfixes5

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2697

Tim Bentley: Approve on 2016-10-02

Phill: Approve on 2016-09-23

Diff: 96 lines (+30/-6)

5 files modified

openlp/plugins/bibles/lib/importers/http.py (+1/-1)
openlp/plugins/songs/lib/importers/mediashout.py (+1/-1)
openlp/plugins/songs/lib/importers/songimport.py (+5/-2)
tests/functional/openlp_plugins/songs/test_mediashout.py (+7/-2)
tests/interfaces/openlp_plugins/bibles/test_lib_http.py (+16/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1618489: Improper characters in Mediashout import cause traceback

Undecided

Fix Committed

Link a bug report

Related blueprints

2700. By Tomas Groth on 2016-09-23

Fix the tidy_text method to not insert linefeeds, which is not allowed in XML.

2699. By Tomas Groth on 2016-09-18

Skip MediaShout import testing on non-win platforms.

2698. By Tomas Groth on 2016-09-18

Try to fix a mediashout import issue by replacing the line tab char with 2 linebreaks.

2697. By Tomas Groth on 2016-09-18

Fix fetching bible texts from CrossWalk.

2696. By Phill on 2016-09-15

Some more bible refactors

lp:~phill-ridout/openlp/even-more-refactors (revision 2707)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1769/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1680/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1618/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1374/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/964/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1032/
[...

2695. By Raoul Snyman on 2016-08-21

Fix bug #1547964 by ignoring the exception (it's harmless)

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/disconnect-slots (revision 2697)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1746/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1657/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1595/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1351/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-...

2694. By Raoul Snyman on 2016-08-14

Fix bug #1608194 by updated OpenLP to use the new SongSelect website.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1608194 (revision 2694)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1739/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1650/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1588/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1344/
[SUCCESS] https://ci.openlp.io/job/Branc...

2693. By Raoul Snyman on 2016-08-12

Update slot signatures to comply with PyQt5.6's stricter checks.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/stricter-slot-signatures (revision 2685)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1723/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1634/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1572/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1333/
[SUCCESS] https://ci.openlp.io/j...

2692. By Phill on 2016-08-12

Some more bible refactors. Mainly focusing on xml parsing and the csv importer

lp:~phill-ridout/openlp/more-bible-refactors (revision 2699)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1708/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1619/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1557/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1319/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/909/
[SUCCESS] htt...

2691. By Azaziah on 2016-08-11

This branch includes various UI string changes, such as:
- Media Manager, Projector Manager, Service Manager, Theme Manager,
   Preview Panel and Live Panel have been renamed to: ”Library,
   Projectors, Service, Themes, Preview and Live."
- Tooltips/texts for these have been changed.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
- etc...

In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...