Commit Graph

12137 Commits

Author SHA1 Message Date
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
Samuel Mehrbrodt
a7bdb9dfa0 Fix bug 1310523
Fixes: https://launchpad.net/bugs/1310523
2014-05-03 15:56:32 +02:00
Samuel Mehrbrodt
938f59416d Fix bug 1199639
Fixes: https://launchpad.net/bugs/1199639
2014-05-03 15:46:48 +02:00
Samuel Mehrbrodt
8b76dcc216 Fix bug 1310523 2014-05-03 14:56:58 +02:00
Samuel Mehrbrodt
922bbc3b57 Typo, remove annotations 2014-05-03 12:53:51 +02:00
Samuel Mehrbrodt
a98ea19306 Add test for songbook display 2014-05-03 12:42:18 +02:00
Samuel Mehrbrodt
e0d813db3f Add an option to display the songbook in the footer 2014-05-03 12:03:50 +02:00
Samuel Mehrbrodt
b7aee018e5 Merge trunk 2014-05-03 11:09:12 +02:00
Samuel Mehrbrodt
e8c7547ab2 Try to get ccli number even if there is text in the field 2014-05-03 10:47:31 +02:00
Tim Bentley
89cbe8bc7d head 2014-05-03 06:28:59 +01:00
Andreas Preikschat
fe52d50619 Various Cleanups
removed not working tests
- removed not needed imports
- removed u' from doc
- use enumerate() instead of second for loop
- do not override build-ins

bzr-revno: 2375
2014-05-03 06:27:31 +01:00
Tomas Groth
689700dd01 fixes for tests 2014-05-02 23:48:59 +02:00
Tomas Groth
5d63820b17 Added support for importing EW songs even if RTF is not escaped as espected, also fixed importing og songs with unicode in metadata.
Fixes: https://launchpad.net/bugs/1299837
2014-05-02 23:07:56 +02:00
Andreas Preikschat
50fb727bae 2014-05-02 20:11:45 +02:00
Andreas Preikschat
f4646f955b 2014-05-02 20:02:25 +02:00
Samuel Mehrbrodt
b993af2e90 No newline at end of file... 2014-05-02 10:04:11 +02:00
Andreas Preikschat
87587ab8e8 short lines 2014-05-02 08:50:54 +02:00
Andreas Preikschat
deff310f53 removed u' 2014-05-02 08:42:17 +02:00
Andreas Preikschat
4231692ae1 removed print 2014-05-02 08:34:57 +02:00
Andreas Preikschat
022ed36dc5 2014-05-02 08:33:18 +02:00