Commit Graph

4080 Commits

Author SHA1 Message Date
rimach
2b700c481f hopefully Line ending corrected and resolve merge conflict 2010-09-10 20:46:04 +02:00
Jonathan Corwin
0cddc0910d Tidy song_import code and fix bug 634771
bzr-revno: 1024
2010-09-10 19:29:54 +01:00
Jonathan Corwin
02abcf24fc Head 2010-09-10 18:52:22 +01:00
Jonathan Corwin
d549935fa8 Bug 634771 - Check for no recent files 2010-09-10 18:49:22 +01:00
Tim Bentley
86dd14a440 Head 2010-09-10 18:40:47 +01:00
Andreas Preikschat
66a22f7711 head 2010-09-10 19:09:36 +02:00
rimach
d4cabf9693 move translations from mediamanager to plugins with dict 2010-09-10 17:50:30 +02:00
rimach
fa328945d3 Head 2010-09-09 23:12:02 +02:00
Tim Bentley
eb93e08d2c Head 2010-09-09 20:36:19 +01:00
Jonathan Corwin
81a1cfc815 Tidy up versetag counting 2010-09-09 20:34:45 +01:00
Raoul Snyman
1dcf3a2769 jQuery-fied the JavaScript, made the interface look a little prettier.
bzr-revno: 1023
2010-09-09 21:01:23 +02:00
Jonathan Corwin
eb4c1f17bc Head 2010-09-09 20:00:39 +01:00
Jonathan Corwin
aafaaab5a8 Head 2010-09-09 19:59:37 +01:00
Derek Scotney
dd4ae3f3e3 Fix verse numbering
bzr-revno: 1022
2010-09-09 19:56:19 +01:00
Derek Scotney
198cd94011 All verse types have auto numbering 2010-09-09 20:30:38 +02:00
Derek Scotney
efd4b77ef8 All verse types have auto numbering 2010-09-09 20:30:25 +02:00
Tim Bentley
439b890662 Head 2010-09-09 19:15:19 +01:00
Jonathan Corwin
15a155044f Left+Bottom align footer, and prevent wrapping
bzr-revno: 1021
2010-09-09 19:05:08 +01:00
Tim Bentley
7b94e59dd3 Proper fix for plugin bug
bzr-revno: 1020
2010-09-09 17:52:37 +01:00
Jonathan Corwin
dd2136774b Remove height, so fix actually works 2010-09-09 08:30:14 +01:00
Jonathan Corwin
58dc96b124 Anchor footer from bottom, and prevent footer line wrapping 2010-09-08 22:55:24 +01:00
Raoul Snyman
158c612cf9 Fixed up the styles a little, and sync'ed to HEAD. 2010-09-08 22:38:37 +02:00
Jonathan Corwin
327370ef39 head 2010-09-08 21:37:12 +01:00
Tim Bentley
0eea3f40f3 Head 2010-09-08 20:39:39 +01:00
Tim Bentley
3bfea1c715 Proper fix for 632674 2010-09-08 20:36:39 +01:00
Tim Bentley
472da0cf27 Short term fix for 633354
Fix display and text bugs

bzr-revno: 1019
Fixes: https://launchpad.net/bugs/594808, https://launchpad.net/bugs/632674
2010-09-08 20:13:58 +01:00
Raoul Snyman
3660571a74 HEAD 2010-09-08 21:07:30 +02:00
Raoul Snyman
c2fdb62e74 Added a simple dialog to display any uncaught exceptions.
bzr-revno: 1018
2010-09-08 21:06:23 +02:00
rimach
8da2009413 Head 2010-09-08 20:40:19 +02:00
Tim Bentley
ccb75ad3b6 Fix display to work on 1024x768 resolution without nasty slider movements
Fixes: https://launchpad.net/bugs/594808
2010-09-08 19:12:16 +01:00
Tim Bentley
b39136782e Quick hack to get songs back 2010-09-08 19:00:48 +01:00
Tim Bentley
cfca50ff25 Fix setText bug when null list item
Fixes: https://launchpad.net/bugs/632674
2010-09-08 18:51:19 +01:00
Tim Bentley
2b43ef77e0 Head1017 2010-09-08 18:44:00 +01:00
Raoul Snyman
fa45204b0c Fixed up the resources patch, and regenerated the resources file. 2010-09-08 18:26:13 +02:00
Raoul Snyman
5a5d537ed7 HEAD 2010-09-08 08:27:38 +02:00
Raoul Snyman
b8893f4ab2 Merge in the openlp.org 1.x importer.
bzr-revno: 1017
2010-09-08 06:57:13 +02:00
rimach
8bdedae911 Head 2010-09-07 23:04:13 +02:00
Raoul Snyman
7c2da6e2e3 Added a global exception catcher, so that our poor n00bs can see what happened. 2010-09-07 22:42:33 +02:00
Tim Bentley
1dd5ee185c Fix song editing bug
bzr-revno: 1016
Fixes: https://launchpad.net/bugs/630247
2010-09-07 19:41:09 +01:00
Tim Bentley
4c648f142c Fix song editing display bug
Fixes: https://launchpad.net/bugs/630247
2010-09-07 17:12:47 +01:00
Raoul Snyman
60fa82b78c Fix bug #598805 2010-09-07 15:23:02 +02:00
Raoul Snyman
f30aecfd46 A couple of bugfixes. 2010-09-07 00:02:48 +02:00
Raoul Snyman
63139e8c3b Just check for the tracks table before importing from it. 2010-09-06 22:41:11 +02:00
Martin Thompson
c25b0aa8ff Test for multi character versetypes 2010-09-06 21:37:22 +01:00
Raoul Snyman
f82513f11d Finally done the openlp.org 1.x song importer. 2010-09-06 22:33:28 +02:00
Martin Thompson
db118196a5 test_opensong passes again 2010-09-06 20:56:20 +01:00
Martin Thompson
53dc52c7c8 merged 2010-09-06 20:43:37 +01:00
Martin Thompson
2ae4c5a1b1 Merged 2010-09-06 20:42:39 +01:00
Raoul Snyman
5e61bf938e HEAD 2010-09-06 20:05:08 +02:00
Tim Bentley
991d8f1caf Fix bugs regarding screen blanking
bzr-revno: 1015
Fixes: https://launchpad.net/bugs/639285, https://launchpad.net/bugs/630254
2010-09-06 16:35:33 +01:00