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

14130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Hanna
5ba53fa097 Merge trunk in 2016-02-22 15:25:22 +01:00
Tim Bentley
9eed19ee50 fix missing bits from revert 2016-02-21 09:29:16 +00:00
Tim Bentley
72a180716b revert changes 2016-02-21 09:23:09 +00:00
Tomas Groth
7c43ae6b88 Another attempt to fully fix bug 1531319, 
Fixes: https://launchpad.net/bugs/1531319
 2016-02-20 22:42:31 +01:00
Tim Bentley
334eb6c8c5 fix missing resize) 2016-02-20 11:51:58 +00:00
Chris Hill
57200fa84e merge with trunk 2016-02-19 20:28:39 +00:00
Chris Hill
5cb833dc31 merge with trunk 2016-02-19 20:28:00 +00:00
Tim Bentley
3e522186ec Displays work now 2016-02-19 18:59:39 +00:00
Tim Bentley
cdbf6ac9ea Fix timers 2016-02-16 21:14:38 +00:00
second@tgc.dk
1c9713ef4e Removed songs used in tests that is not in public domain. 
bzr-revno: 2622
 2016-02-15 23:29:26 +01:00
Tomas Groth
034344ae48 Add missing import. 2016-02-15 22:11:38 +01:00
Tomas Groth
4c883c8cf0 Remove songs used in tests that is not in public domain. 2016-02-15 21:49:23 +01:00
Tim Bentley
30dc055532 Video backgrounds work 2016-02-14 17:53:16 +00:00
Tim Bentley
89f6926a71 Add replacement to context 2016-02-14 16:54:31 +00:00
Tim Bentley
583da17777 pep8 comment fixes 2016-02-14 16:14:48 +00:00
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