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

13880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tomas Groth
17d6f13ac0 More workarounds for bug 1531319. 
Fixes: https://launchpad.net/bugs/1531319
 2016-02-06 20:43:54 +01:00
Chris Hill
f23e2dfb46 update from trunk, works in 2.4 2016-02-06 17:50:58 +00:00
Tim Bentley
7d722b66cf Translations 
bzr-revno: 2615
 2016-02-06 12:55:13 +00:00
Tim Bentley
e2abc6402f trans0602 2016-02-06 11:11:28 +00:00
Tomas Groth
aa8af06f79 If presetation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. 
Fixes: https://launchpad.net/bugs/1490508
 2016-02-05 21:11:36 +01:00
raoul@snyman.info
4a5f77f884 "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..."

bzr-revno: 2614
Fixes: https://launchpad.net/bugs/1533246
 2016-02-05 22:04:00 +02:00
raoul@snyman.info
022261dbd1 "Fix up some warnings we get about BeautifulSoup's parser." 
bzr-revno: 2613
 2016-02-05 21:55:30 +02:00
Raoul Snyman
0802682a13 Fix up some comments 2016-02-05 21:01:21 +02:00
Raoul Snyman
0dd29893da More tests 2016-02-04 23:25:06 +02:00
Raoul Snyman
94edb189e8 Added some tests around the shortcut list form 2016-02-04 23:19:01 +02:00
Raoul Snyman
734bf4ffc4 Fix some BeautifulSoup warnings about parsers. 2016-02-04 22:17:40 +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
Tomas Groth
a02aca022a Use the chosen encoding when importing from easyworship db. 2016-01-31 20:36:54 +01:00
s.mehrbrodt@gmail.com
8fbd431bed 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

bzr-revno: 2612
Fixes: https://launchpad.net/bugs/1537212
 2016-01-30 20:41:22 +00:00
Raoul Snyman
a8c4e497dc Regenerate VLC bindings against a more current version of VLC (rather than VLC master) 
bzr-revno: 2611
 2016-01-30 18:09:23 +00:00
Samuel Mehrbrodt
0f1c7bae44 Add test 2016-01-30 15:13:35 +01:00
Samuel Mehrbrodt
a409306d0d Fix bug 1537212 
Fixes: https://launchpad.net/bugs/1537212
 2016-01-30 09:33:31 +01:00
Raoul Snyman
b2e54a4baa Downgrade VLC.py to a version that is in use 2016-01-25 20:14:03 +02:00
second@tgc.dk
70db5acba9 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. 

bzr-revno: 2610
Fixes: https://launchpad.net/bugs/1533280, https://launchpad.net/bugs/1535332, https://launchpad.net/bugs/1536411
 2016-01-24 15:30:30 +01:00
Tim Bentley
81c9f5f1ca more simplifications 2016-01-24 10:13:33 +00:00
suutari-olli
dee737e3fb Added proper comment 2016-01-23 17:28:16 +02:00
Tomas Groth
fb04813088 remove debug prints 2016-01-23 13:38:08 +01:00
Tim Bentley
4aebe441e7 cleanups 2016-01-23 12:11:34 +00:00
Tim Bentley
06ed550c8f head and Mediainfo 2016-01-23 10:09:36 +00:00
Tim Bentley
29dd834816 debug 2016-01-23 10:07:59 +00:00
Tomas Groth
f61ac941d0 Mock FormattingTags in test, instead of loading all tags. 2016-01-23 10:53:34 +01:00
Tomas Groth
c1108b1593 Fix traceback where OpenSong importer crashed if non-numbers were in the CCLI field. 2016-01-23 09:19:12 +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
Tim Bentley
4a0330f126 Add wrapper for mediainfo 2016-01-22 20:12:46 +00:00
Tomas Groth
692a08f888 When setting the verseorder to uppercase, remember the cursor position. Fixes bug 1536411. 
Fixes: https://launchpad.net/bugs/1536411
 2016-01-22 21:04:31 +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
suutari-olli
5f513a9a1f This simple fix should make blank to desktop, black and theme available during single screen mode 2016-01-22 19:06:35 +02: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
Ian Knight
3900c33083 Corrected pep8 fails 2016-01-19 17:39:09 +10:30
Ian Knight
fbd3f9f3dd Corrected pep8 fails 2016-01-19 17:32:47 +10:30
Ian Knight
7f8e19adca Prevented Single Click Preview when a double click had triggered & Updated tests for this 2016-01-19 17:22:23 +10:30
Ian Knight
34c771688c Tests for Better Preview for Service Manager Blueprint 2016-01-18 12:49:20 +10:30
Ian Knight
960fbb8865 Implemented Better Preview for Service Manager Blueprint 2016-01-18 03:16:37 +10:30
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
raoul@snyman.info
f588b82976 Fix up the tests for Windows by retrying deleting the databases. 
bzr-revno: 2608
 2016-01-15 21:37:53 +01: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
Raoul Snyman
478d356d2e Oops, forgot a variable 2016-01-15 21:41:14 +02:00
Raoul Snyman
48eeb50d02 Add retries around other db removals 2016-01-15 21:14:24 +02:00
Raoul Snyman
1e8d787b93 Make pep8 happy 2016-01-15 20:37:03 +02:00
Raoul Snyman
5d21aab539 Make pep8 happy 2016-01-15 20:31:05 +02:00