Commit Graph

325 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 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
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
Tomas Groth 25557784c8 Added test cases for new json format in service files. 2013-06-17 21:01:11 +02:00
Andreas Preikschat f261a95a37 head 2013-06-16 18:48:37 +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
Andreas Preikschat 67d12883c1 head 2013-06-04 21:36:34 +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
Patrick Zimmermann 0557febe2b Merge trunk. 2013-04-29 20:23:06 +02:00
Patrick Zimmermann 84e9f6f1b1 Add test utils and move a function to there. 2013-04-27 11:54:57 +02:00
phill-ridout 9550405778 Fixed mock raising errors 2013-04-24 20:30:39 +01:00
phill-ridout 5512435c0c Changed then Givens, Whens and Thens arround 2013-04-24 18:37:15 +01:00
Andreas Preikschat 6d414c0fdb r2240 2013-04-23 23:48:51 +02:00
Tim Bentley 0ef65fb8d2 minor fixes 2013-04-23 20:17:25 +01:00
Tim Bentley fba86c5552 Add tests 2013-04-23 20:08:07 +01:00