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

438 Commits

Author SHA1 Message Date
Andreas Preikschat 3a021b6804 Head 2013-07-09 21:47:12 +02:00
Tomas Groth de0f5c912f Use json as services format instead of python pickle. 
bzr-revno: 2275
 2013-07-07 17:53:16 +02:00
Andreas Preikschat 1ce72c3674 head 2013-07-07 15:45:40 +02:00
Philip Ridout 60d3a43c52 Adds a song importer for WorshipCenter Pro. 
Also adds associated tests.

bzr-revno: 2274
 2013-07-07 06:22:32 +01:00
Andreas Preikschat dec7cc64b3 head 2013-07-07 00:20:17 +02:00
Andreas Preikschat 0b93f752b8 fixed songs test 2013-07-06 22:17:24 +02:00
phill-ridout b26793db1f HEAD 2013-07-06 15:23:30 +01:00
phill-ridout d73664e54a Changed TestRecord ot inhearit from object 2013-07-06 15:22:30 +01:00
Tomas Groth 4e1868983e Merged trunk into branch. 2013-07-06 12:27:08 +02:00
Andreas Preikschat f23aafae46 head 2013-07-05 20:47:32 +02:00
Tomas Groth 3218a2e5df Fixed the use of the patch context manager. 2013-07-05 18:21:16 +02:00
Raoul Snyman cee5132b86 Removed a remnant of Tim's test 2013-07-05 09:47:09 +02:00
Raoul Snyman 8ddca0be2b HEAD 2013-07-04 21:15:24 +02:00
Andreas Preikschat b314b59b52 r2266 2013-07-04 08:41:31 +02:00
Andreas Preikschat 15c1c6d907 head + conflicts 2013-07-03 22:20:12 +02:00
Tim Bentley bf61ee3f28 Fix broken tests 
bzr-revno: 2266
 2013-07-03 20:24:38 +01:00
Andreas Preikschat e75a87c5c9 head 2013-07-03 19:03:08 +02:00
Tim Bentley ab3fd38551 Fix broken test 2013-07-03 17:34:40 +01:00
Tim Bentley 538e885cfb Fix broken test 2013-07-03 17:34:02 +01:00
Raoul Snyman 2e4b400cbc Removed a test that seemed in the wrong place, testing the wrong things, and committed at the wrong time. 2013-07-02 22:39:39 +02:00
Raoul Snyman 88e1932097 HEAD 2013-07-02 22:28:06 +02:00
Raoul Snyman 8492ae6a4c Fix a bug in SQLAlchemy 0.8 2013-07-02 22:27:28 +02:00
Tim Bentley 988fca86a1 Fix up registry for Application exit. Remove FormattingTags pickle , Other minor cleanups 
bzr-revno: 2264
 2013-06-30 20:18:21 +01:00
Andreas Preikschat e99ba8a400 head 2013-06-30 19:57:21 +02:00
Andreas Preikschat f4b9ffc481 - fixes bug #1170435 (We should not warn when verse order is empty) 
bzr-revno: 2260
Fixes: https://launchpad.net/bugs/1170435
 2013-06-30 19:42:02 +02:00
phill-ridout 95f75fa869 HEAD Resolved confilct 2013-06-27 19:59:52 +01:00
Tomas Groth 3faec43220 Small fix in the osd2osj test, use just one context manager, and in a better way. Also added test for service item validation. 2013-06-26 22:15:30 +02:00
Tomas Groth be84d53478 Inserted GIVEN-WHEN-THEN comments 2013-06-24 22:38:40 +02:00
Tim Bentley 32c7663a45 Convert formatting tags to json 2013-06-24 17:21:46 +01:00
Raoul Snyman 9bf7284b94 HEAD 2013-06-23 17:29:16 +02:00
Andreas Preikschat 4f8d93638b fixes 2013-06-21 20:13:59 +02:00
Andreas Preikschat 6265ce93de fixed tests 2013-06-21 12:16:50 +02:00
Andreas Preikschat b53ed99eea head 2013-06-21 07:06:16 +02:00
Tomas Groth 25557784c8 Added test cases for new json format in service files. 2013-06-17 21:01:11 +02:00
Tim Bentley ded3671a1b Clean up slide controller and add bible download tests 
bzr-revno: 2253
 2013-06-16 20:34:19 +01:00
Andreas Preikschat 45313cb450 head 2013-06-16 19:20:51 +02:00
Andreas Preikschat f261a95a37 head 2013-06-16 18:48:37 +02:00
Andreas Preikschat 5cce4c9443 head 2013-06-16 18:40:47 +02:00
Patrick Zimmermann 1aeb9bef2f Duplicate Song finder merge - UI and Services. 
bzr-revno: 2252
 2013-06-16 15:53:40 +01:00
Tim Bentley bb36a67ac2 Move tests 2013-06-16 14:36:09 +01:00
Tim Bentley 7bf713a830 minor updates 2013-06-16 09:28:38 +01:00
Tim Bentley e8d5ad7736 Clean up slidecontroller 2013-06-16 08:54:16 +01:00
Tim Bentley d253ef5852 Fix bug and add new test or bibles 2013-06-15 21:51:11 +01:00
Patrick Zimmermann d5cd4aaa91 Merge master. 2013-06-14 22:38:37 +02:00
Patrick Zimmermann 4d8b6f669f Merge master. 2013-06-11 07:31:11 +02:00
Andreas Preikschat 67d12883c1 head 2013-06-04 21:36:34 +02:00
Andreas Preikschat 6ddbdc196d fixed spelling 2013-06-01 20:19:53 +02:00
Andreas Preikschat 1290b85abe removed test 2013-06-01 16:49:47 +02:00
Andreas Preikschat 851c667c8d head 2013-06-01 16:48:30 +02:00
Tim Bentley 9f8a0572bc Fix Presentation plugin so it works. 
Correct abuse of the service item title field
Add migration code and test to prove it

bzr-revno: 2247
 2013-05-25 16:10:09 +01:00