lp:~tomasgroth/openlp/bug719514

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2410

Raoul Snyman: Approve on 2014-08-22

Tim Bentley: Approve on 2014-08-21

Samuel Mehrbrodt: Pending requested 2014-08-21

Diff: 155 lines (+85/-10)

4 files modified

openlp/core/ui/thememanager.py (+1/-1)
scripts/jenkins_script.py (+2/-1)
tests/functional/openlp_core_ui/test_thememanager.py (+80/-6)
tests/functional/openlp_plugins/songs/test_powerpraiseimport.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #719514: Themes: <file> and <otherfile> are the same file

Low

Fix Released

Link a bug report

Related blueprints

2406. By Tomas Groth on 2014-08-21

Fixed another windows test by properly constructing paths.

2405. By Tomas Groth on 2014-08-21

Fixed windows test failure by removing special char from filenames

2404. By Tomas Groth on 2014-08-21

deleted file leftover from merge

2403. By Tomas Groth on 2014-08-04

trunk

2402. By Tomas Groth on 2014-07-14

pep8 fix

2401. By Tomas Groth on 2014-07-14

Updated jenkins script to match tests

2400. By Tomas Groth on 2014-07-14

Merged with trunk and reverted changes to the tag test

2399. By Tomas Groth on 2014-07-07

Fix tag tests

2398. By Tomas Groth on 2014-07-07

trunk

2397. By Tomas Groth on 2014-07-07

Suggested changes to tests