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

12156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Mehrbrodt
d6afa49055 Test fixes 2014-05-13 19:52:08 +02:00
Samuel Mehrbrodt
a75790d699 Indentation 2014-05-13 11:54:12 +02:00
Samuel Mehrbrodt
1804b690bd Merge trunk 2014-05-13 11:53:02 +02:00
Samuel Mehrbrodt
35e23456fe merge trunk 2014-05-13 11:50:36 +02:00
Samuel Mehrbrodt
97b603a2d6 Add test for author matching 2014-05-13 11:44:19 +02:00
Samuel Mehrbrodt
9b173dc0fe Refactor author match check 2014-05-13 11:27:22 +02:00
Samuel Mehrbrodt
b7b0176dec Cleanups 2014-05-13 11:12:07 +02:00
Samuel Mehrbrodt
a1e2e92132 PEP8 2014-05-13 11:09:42 +02:00
Samuel Mehrbrodt
6eb2d4f49d Write test for adding and removing authors 2014-05-13 11:08:46 +02:00
Jonathan Springer
1cd9fff9bd Change how we define which menu items are included in the main menu on Mac OS 
Change variable type to conform to expected type
Make vlcplayer stop() call asynchronous to avoid a deadlock with the UI thread
Add test for the main window function set_service_modified

bzr-revno: 2382
 2014-05-11 05:45:30 +01:00
Tim Bentley
ec7a7b74fe test 2014-05-10 08:38:38 +01:00
Samuel Mehrbrodt
9dd9f21135 Add an option to display the songbook in the footer 
bzr-revno: 2381
 2014-05-10 07:43:18 +01:00
Samuel Mehrbrodt
8592551d81 Fix SongShowPlus Import when CCLI number contains text 
bzr-revno: 2380
 2014-05-09 17:10:07 +01:00
Tomas Groth
45344f900d Fix for crash when importing from a EasyWorship DB that contains unexpected dataformatting 
bzr-revno: 2379
 2014-05-09 16:51:55 +01:00
Tim Bentley
8507924b7e Fix call path 
Fix PEP8 errors

bzr-revno: 2378
 2014-05-09 06:04:55 +01:00
Jonathan Springer
13b9a7de72 Add test for the main window function set_service_modified 2014-05-08 10:57:26 -04:00
Jonathan Springer
6d277ef78d Merge trunk 2014-05-07 19:52:51 -04:00
Jonathan Springer
6de740333b merge trunk 2014-05-07 18:54:14 -04:00
Jonathan Springer
60fa4c2dca Make vlcplayer stop call asynchronous to aviod a deadlock with the UI thread 2014-05-07 18:52:06 -04:00
Tim Bentley
c6d6be30c6 fix 2014-05-07 21:38:34 +01:00
Tim Bentley
dbf2330896 head 2014-05-07 21:37:42 +01:00
Samuel Mehrbrodt
9467b06e14 Merge trunk 2014-05-07 22:31:28 +02:00
Samuel Mehrbrodt
f3a86d87d4 Merge trunk 2014-05-07 22:30:52 +02:00
Stefan Strasser
fb2381f11a fixed bug #1312629 Error on entering invalid character in verse-order 
bzr-revno: 2377
Fixes: https://launchpad.net/bugs/1312629
 2014-05-07 22:29:53 +02:00
Samuel Mehrbrodt
e7a149cd66 Merge some fixes from the 2.0 branch 
bzr-revno: 2376
Fixes: https://launchpad.net/bugs/1157938, https://launchpad.net/bugs/1199639, https://launchpad.net/bugs/1211913, https://launchpad.net/bugs/1216234, https://launchpad.net/bugs/1310523
 2014-05-07 22:18:12 +02:00
Samuel Mehrbrodt
55c9e3e196 Log warning when CCLI no can't be parsed 2014-05-07 21:17:47 +02:00
Tim Bentley
1e6f00c2eb Add test 2014-05-07 17:05:27 +01:00
Samuel Mehrbrodt
6440ac008f Remove unused code 2014-05-07 15:59:31 +02:00
Samuel Mehrbrodt
cca1ce57f3 Add test 2014-05-07 14:07:13 +02:00
Samuel Mehrbrodt
13d9e77c08 Fix bug 1313538 
Fixes: https://launchpad.net/bugs/1313538
 2014-05-07 13:56:14 +02:00
Samuel Mehrbrodt
3d1cb3f383 Add test 2014-05-07 13:00:34 +02:00
Samuel Mehrbrodt
a9e620c175 Remove direct usage of AuthorSong 2014-05-07 12:30:55 +02:00
Samuel Mehrbrodt
ee7a8b9804 Fixes 2014-05-07 12:25:36 +02:00
Samuel Mehrbrodt
aaacbeac69 Fixes 2014-05-07 12:21:27 +02:00
Samuel Mehrbrodt
ef2a03d510 Fix bug 1316979 by making the authors relation viewonly 
Fixes: https://launchpad.net/bugs/1316979
 2014-05-07 11:51:59 +02:00
Tomas Groth
0d48c09180 Added support for import of Zefania XML bibles. 2014-05-06 21:53:08 +02:00
Tomas Groth
0fd815051f Fix for packaging 2014-05-05 19:31:45 +02:00
Tomas Groth
c7ce62bd43 Changed to ignore wrongly formatted songs. 2014-05-05 19:29:57 +02:00
Samuel Mehrbrodt
9b396e7699 Fix bug 1211913 
Fixes: https://launchpad.net/bugs/1211913
 2014-05-05 18:20:54 +02:00
Tim Bentley
d6d3cd1394 Fix call path 2014-05-03 21:00:17 +01:00
Tim Bentley
f21d3cfa83 fix tests 2014-05-03 20:32:19 +01:00
Samuel Mehrbrodt
37653bfd13 Add missing tag to test 2014-05-03 17:34:13 +02:00
Samuel Mehrbrodt
d4edd91d56 This is no longer 2.0 2014-05-03 17:28:31 +02:00
Samuel Mehrbrodt
4a75849708 Fix readme links 2014-05-03 17:27:44 +02:00
Samuel Mehrbrodt
7a1741258a Typo 2014-05-03 17:25:45 +02:00
Samuel Mehrbrodt
f60379b542 Add new test 2014-05-03 17:22:20 +02:00
Samuel Mehrbrodt
b02fc541a3 Reorganize tests 2014-05-03 17:22:10 +02:00
Samuel Mehrbrodt
a6a08bcfdd Fix bug 1157938 
Fixes: https://launchpad.net/bugs/1157938
 2014-05-03 17:01:43 +02:00
Samuel Mehrbrodt
635ab98f73 Fix bug 1216234 
Fixes: https://launchpad.net/bugs/1216234
 2014-05-03 16:19:29 +02:00
Samuel Mehrbrodt
afaf9480c3 Rename variable 2014-05-03 15:58:31 +02:00