Martin Thompson
|
222f10ba45
|
Now fixed the trunk merge
|
2010-07-14 21:52:45 +01:00 |
|
Martin Thompson
|
76a731c725
|
Merged from trunk
|
2010-07-14 21:47:40 +01:00 |
|
Martin Thompson
|
490e2451e0
|
spaces
|
2010-07-14 21:46:23 +01:00 |
|
Martin Thompson
|
d54770646d
|
Rename cclino to ccli_number and theme to theme_name in all song import related files
|
2010-07-14 21:38:46 +01:00 |
|
Martin Thompson
|
0f4c7276b3
|
Using new manager
|
2010-07-14 21:10:27 +01:00 |
|
Jon Tibble
|
1e9022c1f5
|
Fix AdvancedTab layout
bzr-revno: 939
|
2010-07-13 20:04:29 +01:00 |
|
Jon Tibble
|
e1c8aabe0a
|
Fix AdvancedTab layout
|
2010-07-13 19:45:40 +01:00 |
|
Jon Tibble
|
b5f667fe51
|
Fix theme editing (Bug #594909 part 1)
bzr-revno: 938
|
2010-07-13 19:32:29 +01:00 |
|
Jon Tibble
|
cfd54f331f
|
Double click live setting
bzr-revno: 937
|
2010-07-13 17:36:33 +01:00 |
|
Jon Tibble
|
022935fe58
|
Fix last merge
|
2010-07-13 17:31:19 +01:00 |
|
Jon Tibble
|
44506f2c84
|
AdvancedTab: Double click to live
|
2010-07-13 17:00:33 +01:00 |
|
Jon Tibble
|
c7c9a11c36
|
Theme backgrounds (Bug #594911)
bzr-revno: 936
|
2010-07-13 11:37:27 +01:00 |
|
Jon Tibble
|
9d3085ba6c
|
Head r935
|
2010-07-12 23:35:28 +01:00 |
|
Jon Tibble
|
02b33ed660
|
Theme background images (Bug #594911)
|
2010-07-12 23:32:46 +01:00 |
|
Jon Tibble
|
767214bb13
|
Proper theme name editing (Bug #594909)
|
2010-07-12 22:11:00 +01:00 |
|
Jon Tibble
|
a2704186a5
|
Save current media plugin (Bug #596540)
bzr-revno: 935
|
2010-07-12 17:50:54 +01:00 |
|
Andreas Preikschat
|
13c0496553
|
Improve song data integrity
bzr-revno: 934
|
2010-07-12 17:48:54 +01:00 |
|
Jon Tibble
|
eac602389c
|
Code layout tweaks
|
2010-07-12 15:45:55 +01:00 |
|
Jon Tibble
|
46d561b320
|
Add saving current media plugin (Bug #596540)
|
2010-07-12 15:32:48 +01:00 |
|
andreas
|
75f9f809a8
|
use database for checking
|
2010-07-12 15:18:07 +02:00 |
|
Jon Tibble
|
bc280058b7
|
Import fixes
bzr-revno: 933
|
2010-07-12 13:23:09 +01:00 |
|
Jon Tibble
|
4bffb39567
|
Import fixes
|
2010-07-12 11:59:48 +01:00 |
|
Jonathan Corwin
|
e77d6ec981
|
Common thumbnails for all presentation types and create when presentation first added
bzr-revno: 932
|
2010-07-12 08:25:17 +01:00 |
|
Jonathan Corwin
|
bff74507d7
|
Coding standards
|
2010-07-11 21:53:53 +01:00 |
|
Jonathan Corwin
|
fe5b3e6771
|
pptview/impress fixes to thumbnails on Windows
|
2010-07-11 21:22:53 +01:00 |
|
andreas
|
488ead8162
|
cleanup
|
2010-07-11 15:23:12 +02:00 |
|
Jonathan Corwin
|
fb4faf0dbb
|
Powerpoint fix
|
2010-07-10 23:41:36 +01:00 |
|
Jonathan Corwin
|
08c36f7e1c
|
Got a conflict fix wrong
|
2010-07-10 23:33:09 +01:00 |
|
Jonathan Corwin
|
968eaad46a
|
Head
|
2010-07-10 23:28:59 +01:00 |
|
Jonathan Corwin
|
91b3c06849
|
Missed one
|
2010-07-10 23:21:50 +01:00 |
|
Jonathan Corwin
|
27bccda0b6
|
Presentation thumbnail changes
|
2010-07-10 23:21:14 +01:00 |
|
andreas
|
0623d2bb4e
|
fixes for merge
|
2010-07-10 23:44:43 +02:00 |
|
andreas
|
931f572a4e
|
spelling mistakes
|
2010-07-10 23:39:54 +02:00 |
|
andreas
|
ab179f8e12
|
fixes for merge
|
2010-07-10 23:26:09 +02:00 |
|
andreas
|
d6fe2d1c9f
|
oppps... spelling
|
2010-07-10 20:19:54 +02:00 |
|
andreas
|
639ce2bfbc
|
fixed double whitespace
|
2010-07-10 19:30:01 +02:00 |
|
andreas
|
1b536ab0c8
|
Books, Topics and Authors redundancy imporvements.
|
2010-07-10 19:02:42 +02:00 |
|
andreas
|
1489e99c45
|
head931
|
2010-07-10 13:09:03 +02:00 |
|
Jon Tibble
|
8f7c1bafb7
|
Fix recent merge
bzr-revno: 931
|
2010-07-10 12:00:32 +01:00 |
|
Jon Tibble
|
4eb067343c
|
Fix mismerge
|
2010-07-10 11:44:23 +01:00 |
|
Jon Tibble
|
f3a56ecee6
|
Fix service saving (Bug #603798)
bzr-revno: 930
|
2010-07-10 11:31:36 +01:00 |
|
Jon Tibble
|
919d2500a4
|
AdvancedTab
bzr-revno: 929
|
2010-07-10 11:24:21 +01:00 |
|
Jon Tibble
|
4c08162e33
|
Fix docstring for last commit
|
2010-07-10 02:21:03 +01:00 |
|
Jon Tibble
|
60b5568979
|
Fix bug then fix fix! (Bug #603798)
|
2010-07-10 02:01:14 +01:00 |
|
Jon Tibble
|
9d92f358d4
|
AdvancedTab: Creation & Recent files
|
2010-07-09 22:32:32 +01:00 |
|
Martin Thompson
|
bd6337af0d
|
Changed opensong import file extension to All files *.*
|
2010-07-09 19:17:48 +01:00 |
|
Martin Thompson
|
3c21924e03
|
Fixed some coding stds. HAndles unnumbered choruses etc by putting a '1' on the end. Strip out page and column breaks. Theme and CCLI no currently not imported correctly
|
2010-07-09 19:08:03 +01:00 |
|
Jon Tibble
|
e32b349d2c
|
build_icon fixes
bzr-revno: 928
|
2010-07-09 13:03:44 +01:00 |
|
Jon Tibble
|
f1f5a61ef6
|
build_icon fixes
|
2010-07-09 12:26:31 +01:00 |
|
andreas
|
4cb6e767bb
|
head927
|
2010-07-09 10:58:00 +02:00 |
|