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 |
|
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 |
|
Andreas Preikschat
|
76b508848b
|
head
|
2013-06-23 19:21:52 +02:00 |
|
|
9bf7284b94
|
HEAD
|
2013-06-23 17:29:16 +02:00 |
|
Andreas Preikschat
|
8fe2aed62f
|
bytes/str fix
|
2013-06-23 16:38:41 +02:00 |
|
phill-ridout
|
63b0f54b25
|
HEAD
|
2013-06-23 07:14:03 +01: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 |
|
Tim Bentley
|
4d1061f723
|
Clean up registry for application
|
2013-06-21 06:16:35 +01:00 |
|
Andreas Preikschat
|
b53ed99eea
|
head
|
2013-06-21 07:06:16 +02:00 |
|
Tim Bentley
|
f901a0312f
|
Head
|
2013-06-21 05:58:05 +01:00 |
|
Tim Bentley
|
e48b5e4cfb
|
Fix for presentation type
bzr-revno: 2258
|
2013-06-20 21:41:11 +02:00 |
|
Andreas Preikschat
|
da6b1d71cf
|
- removed spaces to fix LO (partly)
bzr-revno: 2257
|
2013-06-20 21:38:04 +02:00 |
|
Tim Bentley
|
0f0097c1a4
|
Fix presentations
|
2013-06-20 20:12:55 +01:00 |
|
Andreas Preikschat
|
c851fa84f0
|
head
|
2013-06-20 20:42:45 +02:00 |
|
Andreas Preikschat
|
aeecc041ec
|
removed spaces
|
2013-06-20 20:04:21 +02:00 |
|
Andreas Preikschat
|
d78d147e1d
|
bug #645452 (increase possible line spacing)
bzr-revno: 2256
Fixes: https://launchpad.net/bugs/645452
|
2013-06-19 16:18:50 +02:00 |
|
Andreas Preikschat
|
de43bfcf2d
|
fixed type() usage
bzr-revno: 2255
|
2013-06-19 16:17:33 +02:00 |
|
Andreas Preikschat
|
2fddcf61b8
|
python3 division fixes
bzr-revno: 2254
|
2013-06-19 16:16:20 +02:00 |
|
Andreas Preikschat
|
658b6f89da
|
import
|
2013-06-18 21:32:04 +02:00 |
|
Andreas Preikschat
|
1e11f4d821
|
true division
|
2013-06-18 11:12:49 +02:00 |
|
Andreas Preikschat
|
62c5908d85
|
python3 division in slidecontroller
|
2013-06-18 11:09:54 +02:00 |
|
Andreas Preikschat
|
8b5e5411c3
|
head
|
2013-06-18 11:01:18 +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
|
bb7bbdf10c
|
use isinstance instead of type
|
2013-06-16 21:42:50 +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
|
6b881e312f
|
added second error message
|
2013-06-16 19:28:44 +02: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
|
39d691d2eb
|
fix
|
2013-06-16 18:46:44 +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 |
|
Andreas Preikschat
|
df493947e7
|
Removed some code not compatible with python 3 to help with the migration
bzr-revno: 2251
|
2013-06-16 15:36:35 +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
|
f3e77b39d7
|
Refactor slide controller so slide list is a separate class
bzr-revno: 2250
|
2013-06-15 20:28:08 +01:00 |
|
Patrick Zimmermann
|
4106ecd71e
|
Remove superfluous comment.
|
2013-06-15 12:56:09 +02:00 |
|
Patrick Zimmermann
|
b18d96b3c9
|
Keep GUI responsive during search. Allow aborting the search.
|
2013-06-15 12:46:00 +02:00 |
|
Patrick Zimmermann
|
d5cd4aaa91
|
Merge master.
|
2013-06-14 22:38:37 +02:00 |
|