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

14315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Bentley
19b6716bea More cleanups comments and flash removal 2016-02-14 15:43:54 +00:00
Tim Bentley
360d1155f1 Remove flash 2016-02-14 08:38:21 +00:00
Tim Bentley
7a72fe84df more updates and cleanups 2016-02-14 08:26:04 +00:00
Tim Bentley
54720d6924 head 2016-02-13 22:11:11 +00:00
Tim Bentley
a6b5b36502 More cleanups 2016-02-13 22:10:11 +00:00
Chris Hill
7887dcbf2b cosmetic 2016-02-13 17:11:35 +00:00
Chris Hill
442f9578d1 test fix for trunk 2016-02-13 17:09:46 +00:00
Chris Hill
a314e11449 merge with trunk 2016-02-13 17:03:23 +00:00
Chris Hill
724efa7cac update from trunk, works in 2.4 2016-02-13 17:02:59 +00:00
Chris Hill
41d627e3f9 natural sort lower case 2016-02-13 16:57:09 +00:00
Chris Hill
3eecea213d merge with trunk 2016-02-13 16:40:16 +00:00
Raoul Snyman
271a35581c Release 2.4 
bzr-revno: 2621
 2016-02-13 16:41:12 +02:00
Tim Bentley
81ec2236fc Translations 1302 
bzr-revno: 2620
 2016-02-13 14:32:51 +00:00
Tim Bentley
ea40173f9b new start 2016-02-13 13:13:00 +00:00
Tim Bentley
45fa840c7e trans1302 2016-02-13 13:00:05 +00:00
Tim Bentley
108ed79e7b fix up 2016-02-13 12:48:36 +00:00
second@tgc.dk
77a937836a Fix for force-updating display on windows when using themes without transitions. 
Pep8 fix + a test.

bzr-revno: 2619
 2016-02-12 21:52:09 +01:00
Tomas Groth
e99fe71ca2 Added test 2016-02-12 21:23:18 +01:00
Tomas Groth
510e109ff5 trunk 2016-02-12 20:59:32 +01:00
raoul@snyman.info
3676cef69f "Fix the toggle song usage menu item not working 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1544263 (revision 2618)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1279/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1203/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1142/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/978/
Stopping after failure"

bzr-revno: 2618
Fixes: https://launchpad.net/bugs/1544263
 2016-02-12 21:46:29 +02:00
Tomas Groth
b90dbbc303 pep8 fix 2016-02-12 20:46:04 +01:00
Raoul Snyman
dcd39adfe2 [songusage] No need to trigger the action twice 2016-02-11 23:05:41 +02:00
Tomas Groth
fdb53f919f Fix for force-updating display on windows when using themes without transitions. 2016-02-09 22:01:20 +01:00
Chris Hill
76e7faf1aa Remove _try_int function - spurious 2016-02-07 09:27:28 +00:00
Raoul Snyman
a172183a4e Release 2.3.3 
bzr-revno: 2617
 2016-02-06 23:12:06 +02: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
c75d0cee29 Added a test. 2016-02-06 21:33:27 +01:00
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