lp:~tomasgroth/openlp/bugfixes7

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2451

Raoul Snyman: Approve on 2014-12-06

Tim Bentley: Approve on 2014-11-26

Diff: 276 lines (+108/-28)

7 files modified

openlp/core/ui/slidecontroller.py (+5/-0)
openlp/plugins/remotes/html/openlp.js (+7/-3)
openlp/plugins/remotes/html/stage.js (+2/-2)
openlp/plugins/remotes/lib/httprouter.py (+1/-3)
openlp/plugins/songs/lib/upgrade.py (+37/-20)
tests/functional/openlp_core_ui/test_slidecontroller.py (+4/-0)
tests/functional/openlp_plugins/songs/test_db.py (+52/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1266271: Output display returns after pressing esc when looping slides	Medium	Fix Released
Bug #1390015: Service Item Notes on Stage view	Low	Fix Released
Bug #1391638: Songs database error when upgrading from 2.0.5 to 2.1.1	High	Fix Released

Link a bug report

Related blueprints

2453. By Tomas Groth on 2014-11-25

Fix slidecontroller test

2452. By Tomas Groth on 2014-11-25

When escaping live display stop looping to prevent display to reappear. Fixes bug 1266271

2451. By Tomas Groth on 2014-11-25

Treat slide notes and servicemanager notes differently in the web remote and stage view. Fixes bug 1390015

2450. By Tomas Groth on 2014-11-25

Added one more test for song db upgrade

2449. By Tomas Groth on 2014-11-25

Added test for song db upgrade

2448. By Tomas Groth on 2014-11-24

Fix upgrade on song db with lost version. Fixes bug 1391638

2447. By on 2014-11-19

Fix for overwriting files on song export + test. Fixes bug 1216232.
Only show slide-dropdown on live-slidecontroller when it is populated. Fixes bug 1390238.
Make sure that the slidecontroller toolbar layout is correctly adjusted to fit its size. Fixes bug 1387304.
Mark a song edited from preview as coming from plugin. Fixes bug 1382672
Make the settingswindow higher to make room for the new settings. Fixes bug 1377283.

2446. By Tomas Groth on 2014-11-19

Fix for bug #1387278: Crash when exporting settings
Fix for bug #1390917: Traceback when copying or creating a theme with background image on Windows
Fix for bug #1390986: Worship Assistent import gives traceback, also improved WA verseorder import
Fix for bug #1390987: Traceback when previewing item from service list
Fix traceback when saving service while in debug mode

2445. By Ken Roberts on 2014-11-09

Fix Projector Manager dock so View->Lock Panels will lock/unlock the UI features

2444. By Phill on 2014-11-09

Added new ColorButton subclassed from QPushButton to select colours reducing code duplication
Added tests for ColorButton
Renamed some methods to take in to account the new signal that ColorButton emits
Fixed some tests for FileDialog