lp:~raoul-snyman/openlp/bug-1544263

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2618

Tim Bentley: Approve on 2016-02-11

Diff: 72 lines (+32/-2)

3 files modified

.bzrignore (+1/-0)
openlp/plugins/songusage/songusageplugin.py (+0/-1)
tests/functional/openlp_plugins/songusage/test_songusage.py (+31/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1544263: Tools -> Song Usage Tracking -> Toggle Tracking doesn't work

Medium

Fix Released

Link a bug report

Related blueprints

2618. By Raoul Snyman on 2016-02-11

[songusage] No need to trigger the action twice

2617. By Raoul Snyman on 2016-02-06

Release 2.3.3

2616. By Tomas Groth on 2016-02-06

More workarounds for bug 1531319.
If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test.
Use the chosen encoding when importing from easyworship db.

2615. By Tim Bentley on 2016-02-06

Translations

2614. By Raoul Snyman on 2016-02-05

"Fixed a problem with the shortcuts.
Also tried to make the alternate clear button on the shortcuts dialog a little less weird.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1533246 (revision 2616)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1275/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1199/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1138/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functi..."

2613. By Raoul Snyman on 2016-02-05

"Fix up some warnings we get about BeautifulSoup's parser."

2612. By Samuel Mehrbrodt on 2016-01-30

Fix entering Songbooks with keyboard

Also clear songbook entry field when editing another song

lp:~sam92/openlp/bug-1537212 (revision 2611)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1273/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1197/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1136/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/972/
Stopping after failure

2611. By Raoul Snyman on 2016-01-30

Regenerate VLC bindings against a more current version of VLC (rather than VLC master)

2610. By Tomas Groth on 2016-01-24

Fix traceback where OpenSong importer crashed if non-numbers were in the CCLI field.
Fix some broken tests that was not being used due to naming.
When setting the verseorder to uppercase, remember the cursor position. Fixes bug 1536411.
Disable OpenGL on linux (too). Fixes bug 1535332.
Disable OpenGL on windows to make webkit player work.
Made workaround for windows display not updating, and disabled OpenGL on Windows, fixes bug 1531319.
Fix playback of linked audio. Fixes bug 1533280.

2609. By Samuel Mehrbrodt on 2016-01-16

"* Fix importing older song dbs by migrating them first
* Fix comparing songs without title

lp:~sam92/openlp/bug-1533081 (revision 2615)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1260/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1184/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1123/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/959/
Stopping after failure"