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

335 Commits

Author SHA1 Message Date
Andreas Preikschat 53d5cda91a - fixed presentation file mask 
bzr-revno: 2279
 2013-07-18 08:09:00 +02:00
Raoul Snyman 19c81c4192 Fix up the build_file_mask_string test. 
- Fix up the build_file_mask_string test by mocking out the __init__() method of the PresentationMediaItem class
    - Change the way of calling the parent __init__() method to something slightly better (though it has nothing to do with the test)
 2013-07-18 06:54:49 +02:00
Andreas Preikschat 11597d7252 missing empty line 2013-07-18 06:53:20 +02:00
Raoul Snyman cec9689dce Fix up the build_file_mask_string test. 
- Fix up the build_file_mask_string test by mocking out the __init__() method of the PresentationMediaItem class
- Change the way of calling the parent __init__() method to something slightly better (though it has nothing to do with the test)
 2013-07-17 23:07:52 +02:00
Andreas Preikschat b129010059 added assertion message 2013-07-17 16:28:22 +02:00
Andreas Preikschat 6e66cdefcf clean ups 2013-07-17 16:19:21 +02:00
Andreas Preikschat 4fee73fc37 added test 2013-07-17 15:59:35 +02:00
phill-ridout 9190019ce9 head 2013-07-08 06:39:32 +01:00
Tomas Groth de0f5c912f Use json as services format instead of python pickle. 
bzr-revno: 2275
 2013-07-07 17:53:16 +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 0b93f752b8 fixed songs test 2013-07-06 22:17:24 +02:00
phill-ridout d1b2cd67c9 Fixed if statment logic. 
Fixed test
 2013-07-06 15:40:49 +01:00
phill-ridout 15153ace9c HEAD 2013-07-06 15:27:11 +01: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
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
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
phill-ridout b344d6b52b changed test path to be "more" compatable with other os's 2013-07-02 22:10:28 +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
phill-ridout e9c56b6cc5 Corrected if statment and added enumeration class. 2013-06-28 22:16:44 +01:00
phill-ridout 95f75fa869 HEAD Resolved confilct 2013-06-27 19:59:52 +01:00
phill-ridout 6fabfef7d8 Made changes as suggested in previous merger comments 2013-06-27 09:36:00 +01:00
phill-ridout 0c8a13a087 HEAD 2013-06-27 09:30:34 +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
phill-ridout 63b0f54b25 HEAD 2013-06-23 07:14:03 +01:00
Tomas Groth 25557784c8 Added test cases for new json format in service files. 2013-06-17 21:01:11 +02:00
Patrick Zimmermann 1aeb9bef2f Duplicate Song finder merge - UI and Services. 
bzr-revno: 2252
 2013-06-16 15:53:40 +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
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
Tim Bentley 6dd070f60e Add migration test 2013-05-25 06:48:08 +01:00
Arjan Schrijver 1a0e583880 Fix bugs in group images 
- Fixed traceback on canceling the 'choose group' dialog
- Clear the 'new group' lineedit in the 'choose group' dialog
- Fixed traceback on adding multiple image groups to the service in one go
- Fixed a bug where new image groups added from the 'choose group' popup weren't added to the 'add group' and 'choose group' popup selectboxes
- Cleaned up obsolete line in imagetab
- Added a simple test for onResetClick()
- Added a test for recursively_delete_group()

bzr-revno: 2245
 2013-05-23 16:35:56 +01:00
Andreas Preikschat b99d9a7ac9 More Python 3 changes - division fixes 
bzr-revno: 2244
 2013-05-19 19:13:26 +01:00
Arjan Schrijver 24cefc7249 HEAD 2013-05-19 13:32:31 +02:00
Arjan Schrijver 255ed90d97 Change helper method to private 2013-05-19 13:31:02 +02:00
Tim Bentley 945a99ea24 Fix up merge issues 2013-05-19 08:35:07 +01:00
Andreas Preikschat 6e66edce03 removed test 2013-05-18 10:49:21 +02:00
Andreas Preikschat 7a42cd3769 added test 2013-05-18 10:44:03 +02:00
Arjan Schrijver dcd346c8e5 HEAD 2013-05-14 16:57:37 +02:00
Andreas Preikschat d03a9a8eec added comments 2013-05-12 14:04:15 +02:00
Andreas Preikschat 75c8382188 added test 2013-05-12 14:02:48 +02:00