OpenLP

Merge lp://qastaging/~suutari-olli/openlp/bug-fixes-2-4-3 into lp://qastaging/openlp

  1. bug-fixes-2-4-3
  2. Merge into trunk
Proposed by Azaziah
Status: Superseded
Proposed branch: lp://qastaging/~suutari-olli/openlp/bug-fixes-2-4-3
Merge into: lp://qastaging/openlp
Diff against target: 302 lines (+90/-90)
7 files modified
openlp/core/__init__.py (+40/-6)
openlp/core/lib/__init__.py (+15/-22)
openlp/core/ui/advancedtab.py (+0/-21)
openlp/core/ui/lib/treewidgetwithdnd.py (+6/-1)
openlp/core/ui/slidecontroller.py (+2/-0)
tests/functional/openlp_core_lib/test_lib.py (+25/-37)
tests/functional/openlp_plugins/bibles/test_swordimport.py (+2/-3)
To merge this branch: bzr merge lp://qastaging/~suutari-olli/openlp/bug-fixes-2-4-3
Reviewer Review Type Date Requested Status
OpenLP Core Pending
Review via email: mp+307559@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-09-30.

This proposal has been superseded by a proposal from 2016-10-17.

Description of the change

This branch fixes the following bugs:
Bug #1487788: Importing photos does not give focus to OpenLP
Bug #1512040: Loop tooltip gets stuck to "Stop playing..."
Bug #1513490: List of authors uses localized "and" instead of English
Bug #1624661: Missing DB in unmounted disk results in Traceback

lp:~suutari-olli/openlp/bug-fixes-2-4-3 (revision 2712)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1790/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1701/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1639/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1395/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/985/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1053/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/921/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/84/

To post a comment you must log in.
lp://qastaging/~suutari-olli/openlp/bug-fixes-2-4-3 updated
2713. By Azaziah

- Not sure why the db bug is fixed in this branch

2714. By Azaziah

- For jenkins

2715. By Azaziah

- Added one missing empty row

2716. By Azaziah

- Attempt to fix jen

2717. By Azaziah

 pep8

2718. By Azaziah

- Removed self from def handle_db_error

2719. By Azaziah

- Actually fixed the missing DB bug.

2720. By Azaziah

- Code cleanup

2721. By Azaziah

- Merged trunk on 17/10/16

2722. By Azaziah

- Modified the def create_separated_list by suggestions of TRB143

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.