raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,685 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

6313 Commits

Author SHA1 Message Date
Raoul Snyman 33c5f7674e Fix bug #1547964 by ignoring the exception (it's harmless) 
Fixes: https://launchpad.net/bugs/1547964
 2016-08-14 09:31:19 +02:00
Raoul Snyman 7d5a640a16 Disconnect the slots for a signal before assigning new ones 2016-08-14 09:03:40 +02:00
Tim Bentley a7dd65245a Fix bug and test it 2016-08-13 05:45:37 +01:00
Raoul Snyman c4a257c9dd Remove a logging line I never wrote, and move a variable in a test that I need to mock 2016-08-12 11:23:56 +02:00
Raoul Snyman c3bb167b32 Fix some under-indented lines 2016-08-10 11:32:57 +02:00
Raoul Snyman e4468573dc Fix some slot signatures that were the incorrect type 2016-08-10 10:58:55 +02:00
raoul@snyman.info 989356c24e Fix a permission error that we should have fixed ages ago. 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/permission-error-2.4 (revision 2645)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1676/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1587/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1525/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1290/
[SUCCESS] https://ci.openlp.io/job/Branch-...

bzr-revno: 2646
 2016-08-02 23:13:13 +02:00
raoul@snyman.info 01c6cb0f8b Fix a permission error that we should have fixed ages ago. 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/permission-error-2.4 (revision 2645)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1676/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1587/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1525/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1290/
[SUCCESS] https://ci.openlp.io/job/Branch-...

bzr-revno: 2645
 2016-08-02 22:22:31 +02:00
Raoul Snyman f3796fa3d2 Fix the permission error for once and for all 2016-07-19 22:56:31 +02:00
Ken Roberts 319870aa83 Merge 2.4 base - fix conflicts 2016-06-25 10:32:32 -07:00
Ken Roberts 7abbb2abb3 bugfix 1593882 and 1593883 backports 2016-06-17 20:18:52 -07:00
Ken Roberts 9ba66f29da pep8 2016-06-02 23:36:38 -07:00
Ken Roberts 2dd4c87dde Bugfix 1588369 - projectorNetwork signal/slot signature mismatch 2016-06-02 23:26:04 -07:00
second@tgc.dk d8d6917b7d Fix of tracback during SongPro import. Fixes bug 1582152. 
Backport of song-search-fix from trunk
Added support for using the new mutool in mudraw mode
Fix crosswalk bible list download
Fix traceback if bible list download fails.

bzr-revno: 2635
Fixes: https://launchpad.net/bugs/1579648, https://launchpad.net/bugs/1582152
 2016-05-24 17:16:57 +01:00
Tomas Groth d5c9fd33c5 Merge 2.4.x trunk 2016-05-24 12:53:47 +02:00
Tim Bentley d78ed92c4e fixes 2016-05-23 19:15:07 +01:00
Tomas Groth 94a8057a6a Backport of fix from trunk 2016-05-16 12:14:37 +02:00
raoul@snyman.info af54780de5 "Fix the Transifex API URL 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/transifex-api-2.4 (revision 2632)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1536/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1447/
[FAILURE] https://ci.openlp.io/job/Branch-03-Interface-Tests/1385/"

bzr-revno: 2631
 2016-05-12 22:30:52 +02:00
Tomas Groth 895b3bf9b5 Fix slide order change when splitting custom slides. Fixes bug 1554748. Fix EasyWorship import issues with missing verses and traceback on unknown chars. Fix traceback in the bug-report dialog. Fixes bug 1554428. Fix weird test bug in test_pluginmanager.py. 2016-04-21 21:57:00 +02:00
Tim Bentley f46f3e835c theme update 2016-04-02 18:58:27 +01:00
Ken Roberts 045744dc17 Backport fix for non-standard reply for PJLink class request 2016-03-03 09:15:58 -08:00
Tomas Groth fdb53f919f Fix for force-updating display on windows when using themes without transitions. 2016-02-09 22:01:20 +01:00
second@tgc.dk 8d083af742 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.

bzr-revno: 2616
Fixes: https://launchpad.net/bugs/1490508
 2016-02-06 21:53:23 +01:00
Tomas Groth 17d6f13ac0 More workarounds for bug 1531319. 
Fixes: https://launchpad.net/bugs/1531319
 2016-02-06 20:43:54 +01:00
Raoul Snyman 0dd29893da More tests 2016-02-04 23:25:06 +02:00
Raoul Snyman 5928fde62e Fix a weird issue with the 'clear alternate shortcut' button clearing both 2016-02-02 23:56:03 +02:00
Raoul Snyman f6c2a5b410 Fix bug #1533246 
Fixes: https://launchpad.net/bugs/1533246
 2016-02-02 23:55:37 +02:00
Raoul Snyman b2e54a4baa Downgrade VLC.py to a version that is in use 2016-01-25 20:14:03 +02:00
Tomas Groth fb04813088 remove debug prints 2016-01-23 13:38:08 +01:00
Tomas Groth c34bfd6d95 Adjusted string 2016-01-23 09:15:37 +01:00
Tomas Groth 4594fcefbd pep fixes 2016-01-22 22:33:20 +01:00
Tomas Groth 4bef5f72f2 trunk 2016-01-22 22:30:26 +01:00
Tomas Groth e593d77e14 Fix some broken tests that was not being used due to naming. 2016-01-22 22:26:25 +01:00
Tomas Groth 9415018899 Disable OpenGL on linux (too). Fixes bug 1535332. 
Fixes: https://launchpad.net/bugs/1535332
 2016-01-22 20:52:50 +01:00
Tomas Groth 7d677025b5 Disable OpenGL on windows to make webkit player work. 2016-01-21 22:18:56 +01:00
Tomas Groth 85c329fb26 Workaround for windows display not updating, webkit player does not work yet. Partial fix for bug 1531319. 
Fixes: https://launchpad.net/bugs/1531319
 2016-01-20 23:25:40 +01:00
s.mehrbrodt@gmail.com ddfed93fbe "* 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"

bzr-revno: 2609
Fixes: https://launchpad.net/bugs/1533081, https://launchpad.net/bugs/1534306
 2016-01-16 22:13:41 +02:00
Tomas Groth 6b23a2224f Fix playback of linked audio. Fixes bug 1533280. 
Fixes: https://launchpad.net/bugs/1533280
 2016-01-15 21:22:08 +01:00
Tomas Groth e91520fa60 pep8 fixes 2016-01-13 22:00:46 +01:00
Tomas Groth 6f9056c935 trunk 2016-01-12 22:36:32 +01:00
Tomas Groth 3f3078c33a Fix traceback when expanding and collapsing songs. 
Fixes: https://launchpad.net/bugs/1532169
 2016-01-12 22:29:20 +01:00
Tomas Groth e3d7e436f1 In _process_item, postpone check for _reset_blank, since the service_item can change type while being execute (Pdf->Image). For the same reason always use the serviceitem that might have been converted. 2016-01-12 21:17:15 +01:00
simon.hanna@serve-me.info 98258bc753 Reenable the stylesheet 
remove the icons from mediamanager so that display in plasma works

bzr-revno: 2605
Fixes: https://launchpad.net/bugs/1404669
 2016-01-11 21:57:20 +00:00
Tomas Groth c8fd1b8338 Fix taking screenshots while using powerpoint or impress. 
Fixes: https://launchpad.net/bugs/1532938
 2016-01-11 22:13:57 +01:00
Simon Hanna 9d8c757d0d Re-enable the stylesheet, remove icon in mediamanager to fix rendering in plasma 2016-01-10 19:01:36 +01:00
Simon Hanna 4d7ceba301 Merge with trunk 2016-01-10 17:01:43 +01:00
Simon Hanna e172e2aeb2 Revert Changes 2016-01-10 17:00:05 +01:00
s.mehrbrodt@gmail.com ad37560ecd lp:~sam92/openlp/multiple-songbooks (revision 2607) 
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1226/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1151/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1090/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/928/
Stopping after failure

bzr-revno: 2600
 2016-01-09 19:53:09 +00:00
Ken Roberts 5a2c3e5abc Ticket 921817 - exception when connecting using PJLink authentication method 
Fix incorrect location data when projector instance created.

Fix typo in getting authenticated connection salt setup.

Move salt/pin/test hash to resources file for multiple tests.

Add test for ticket 921817.

Passes local nosetests3 and pep8.

bzr-revno: 2599
 2016-01-09 19:44:30 +00:00
Raoul Snyman 9904ba8da8 Remove media manager stylesheet for now 2016-01-09 21:10:56 +02:00