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

12167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ec2f013d1d r2265 2013-07-03 19:20:53 +02:00
Andreas Preikschat
3d738616f8 updated from MASTER 2013-07-03 19:20:23 +02:00
Andreas Preikschat
08f47c4a49 fixed str.decode 2013-07-03 19:10:37 +02:00
Andreas Preikschat
ba462d321b reverted change 2013-07-03 19:06:21 +02:00
Andreas Preikschat
97a4bdf286 reverted changes to prevent merge conflicts 2013-07-03 19:04:45 +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
phill-ridout
8713bba796 added pyodbc module to the check_dependencies script 2013-07-02 22:24:18 +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
Andreas Preikschat
8ee3e7265c renames 2013-07-01 08:57:13 +02:00
Andreas Preikschat
9b4518467a r2265 2013-07-01 08:48:01 +02:00
Andreas Preikschat
93bd032cd9 html_builder clean up 2013-07-01 08:47:20 +02:00
Andreas Preikschat
d1bbc5e757 empty commit, hoping that the 2.2.2 tag is deleted properly 
bzr-revno: 2265
 2013-06-30 21:23:26 +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
2b584dabc7 - Converted last print statements to print functions. 
- Removed old test

bzr-revno: 2263
 2013-06-30 20:53:17 +02:00
Andreas Preikschat
3ac1cb5684 - removed depreciated warnings 
- clean up

bzr-revno: 2262
 2013-06-30 20:53:02 +02:00
Tim Bentley
f583be0c76 fix registry call 2013-06-30 19:39:38 +01:00
Andreas Preikschat
72933138a2 clean up 2013-06-30 20:37:12 +02:00
Tim Bentley
1d571507db remove import 2013-06-30 19:36:52 +01:00
Andreas Preikschat
143ce0015f added __hash__ methods 2013-06-30 20:33:41 +02:00
Andreas Preikschat
aa2df0c5d1 removed test 2013-06-30 20:08:50 +02:00
Andreas Preikschat
8dd068b9c1 print func 2013-06-30 20:03:26 +02:00
Andreas Preikschat
e99ba8a400 head 2013-06-30 19:57:21 +02:00
Andreas Preikschat
7a33b93473 - Removed the loop code and use the loop attribute. 
bzr-revno: 2261
 2013-06-30 19:55:22 +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
Tim Bentley
5af820b7cd more cleanups 2013-06-30 06:45:34 +01:00
Tim Bentley
74432f93e2 oops 2013-06-30 06:35:57 +01:00
Tim Bentley
96fbb5ddbb clean up tags 2013-06-30 06:30:42 +01:00
Patrick Zimmermann
92d586427d Reset preview when reseting live background. 2013-06-29 12:00:44 +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
Andreas Preikschat
51905bcb59 fixed AttributeError (ticket 2030) 
bzr-revno: 2259
 2013-06-27 11:52:22 +02: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
Andreas Preikschat
f0693e8163 fixed bs4.__version__ 2013-06-26 20:54:21 +02:00
Tim Bentley
b6954eba0f Rename tag 2013-06-25 15:44:56 +01:00
Tomas Groth
be84d53478 Inserted GIVEN-WHEN-THEN comments 2013-06-24 22:38:40 +02:00
Tim Bentley
26e80be5b7 Who forgot the return 2013-06-24 17:54:23 +01:00
Tim Bentley
32c7663a45 Convert formatting tags to json 2013-06-24 17:21:46 +01:00
Dmitriy Marmyshev
ed66c5cf34 Trunk 2013-06-24 19:12:01 +04:00
Tim Bentley
d32ece04a5 add missing imports 2013-06-23 20:51:17 +01:00
Andreas Preikschat
0fee84cbb6 works now 2013-06-23 19:32:25 +02:00
Andreas Preikschat
c30748873c python3 fix 2013-06-23 19:22:44 +02:00