raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
8,203 Commits 5 Branches 0 Tags 296 MiB
ae5998e2dc
Commit Graph

8203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rimach
ae5998e2dc sync 2011-12-05 18:43:54 +01:00
Raoul Snyman
b7e7da56e6 Fixed a minor bug where if you imported 2 OpenLP 2.0 databases in the same OpenLP session whose schemas were different, you'd get an error about missing columns or tables. 
bzr-revno: 1823
 2011-12-05 18:06:47 +01:00
Jon Tibble
35d13cc90b Fix non-acsii service filename loading 
bzr-revno: 1822
 2011-12-04 21:51:09 +00:00
Jon Tibble
6b91f58da3 Head r1821 2011-12-04 20:58:39 +00:00
Jon Tibble
a54e7ff709 Fix non-ascii service filename loading 2011-12-04 20:57:58 +00:00
Raoul Snyman
ba0a4bb827 HEAD 2011-12-04 22:52:08 +02:00
Jon Tibble
6336915b4e Reduce recent file list duplication (Bug #892668) 
bzr-revno: 1821
 2011-12-04 20:50:52 +00:00
Raoul Snyman
11f5dfcfcd HEAD 2011-12-04 22:50:39 +02:00
Raoul Snyman
06570a9941 Fixed a minor bug where if you imported 2 OpenLP 2.0 databases in the same OpenLP session whose schemas were different, you'd get an error. 2011-12-04 22:50:13 +02:00
Raoul Snyman
90d8b211d9 Hopefully the final fix to all our database woes. 
bzr-revno: 1820
 2011-12-04 20:19:20 +02:00
Jon Tibble
5804dade74 Reduce recent file list duplication (Bug #892668) 2011-12-04 14:42:39 +00:00
Raoul Snyman
c825df38fa Hopefully the final piece of the fix. 2011-12-04 15:26:27 +02:00
Jon Tibble
c52e719b82 Head r1819 2011-12-04 12:44:35 +00:00
Andreas Preikschat
5d664d629d fixed bug 768495 (Shortcut can be assigned twice in certain circumstances) 
bzr-revno: 1819
Fixes: https://launchpad.net/bugs/768495
 2011-12-04 12:08:09 +01:00
Andreas Preikschat
3218ab3d8f - fixed a few tooltip strings 
bzr-revno: 1818
 2011-12-04 12:07:05 +01:00
Raoul Snyman
f1c4367127 Fix various OpenLP 2 import problems. 
bzr-revno: 1817
Fixes: https://launchpad.net/bugs/863845, https://launchpad.net/bugs/899532
 2011-12-04 12:02:49 +02:00
Raoul Snyman
2016ce61ca Sometimes the song_id column doesn't exist on the model, so we use the table instead. 2011-12-04 00:30:22 +02:00
Raoul Snyman
def18307cc Avoid an error about something not being a Boolean. 
Fixes: https://launchpad.net/bugs/899532
 2011-12-03 23:49:40 +02:00
Raoul Snyman
2e7a25697d HEAD 2011-12-03 23:40:30 +02:00
Andreas Preikschat
b78bb1c7e6 fixed tooltip strings 2011-12-03 21:35:53 +01:00
Andreas Preikschat
47c1aaa98e r1816 2011-12-03 21:31:21 +01:00
Andreas Preikschat
cde640df6e fixed bug 887313 (Song Usage records printed songs when it should not ) 
bzr-revno: 1816
Fixes: https://launchpad.net/bugs/887313
 2011-12-03 19:57:15 +01:00
Raoul Snyman
76d10b094f HEAD 2011-12-03 20:33:12 +02:00
Raoul Snyman
5b67d36b3c Fix problem where importing new song databases now does not work. 
Fixes: https://launchpad.net/bugs/863845
 2011-12-03 20:23:46 +02:00
Andreas Preikschat
f34ae80eec fixed bug 887313 
Fixes: https://launchpad.net/bugs/887313
 2011-12-03 19:01:36 +01:00
Jon Tibble
882663c1be Head r1815 2011-12-03 16:14:20 +00:00
Andreas Preikschat
ae8f57f707 r1815 2011-12-03 16:09:50 +01:00
Andreas Preikschat
5bfc101f09 changed name 2011-12-03 16:09:03 +01:00
Tim Bentley
13ec25eef5 Fix the plugin Disabled route as it has never been tested 
Stop plugins being available if the database is more advanced than the code.

bzr-revno: 1815
 2011-12-03 14:42:44 +00:00
Andreas Preikschat
eb121abb12 attempt to fix bug 768495 
Fixes: https://launchpad.net/bugs/768495
 2011-12-03 15:38:30 +01:00
Jon Tibble
d05e3a02d2 Cleanups 
bzr-revno: 1814
 2011-12-03 14:37:05 +00:00
Jon Tibble
9c0bde098f Fix spacing 2011-12-03 13:40:48 +00:00
Tim Bentley
b37c41d7a8 minor fixes 2011-12-03 13:32:19 +00:00
Tim Bentley
1239cd707c Fix database versions 2011-12-03 12:51:40 +00:00
Raoul Snyman
a5a2b0a881 Fixes bug #899487. Added a missing dependency. 
bzr-revno: 1813
Fixes: https://launchpad.net/bugs/899487
 2011-12-03 14:04:33 +02:00
Raoul Snyman
69c33adba7 Added a missing dependency (python-qt4-gl). 2011-12-03 13:42:49 +02:00
Tim Bentley
0a5d089f07 Head 2011-12-03 11:22:44 +00:00
rimach
8412caf006 new version of vlc.py 2011-12-03 00:45:05 +01:00
Jon Tibble
02f5e819fb Revert broken old incomplete thought 2011-12-02 22:23:37 +00:00
rimach
2c225c19a0 bugfixing 2011-12-02 23:00:28 +01:00
Jon Tibble
bd02fb5f30 Whitespace 2011-12-02 21:49:20 +00:00
Jon Tibble
e526687c71 Cleanup fix 2011-12-02 21:33:11 +00:00
Jon Tibble
f970d9462d Cleanups 2011-12-02 21:13:05 +00:00
Jon Tibble
bba6d6730f Head r1812 2011-12-02 20:17:57 +00:00
rimach
11acf005e2 add empty line 2011-12-02 16:15:31 +01:00
rimach
cc2c58d9dc sync with trunk 2011-12-02 16:12:59 +01:00
Raoul Snyman
512bab74c3 Added a missing import. 
bzr-revno: 1812
Fixes: https://launchpad.net/bugs/898876
 2011-12-02 11:52:49 +02:00
Raoul Snyman
f8ea1349f4 Fix importing of newer songs databases. 
bzr-revno: 1811
Fixes: https://launchpad.net/bugs/863845
 2011-12-02 11:50:20 +02:00
Raoul Snyman
24095edc2b Added a missing import. 
Fixes: https://launchpad.net/bugs/898876
 2011-12-02 08:59:32 +02:00
Christian Richter
e8f0bf5cd1 Rewrite of the multimedia stuff. 
bzr-revno: 1810
 2011-12-02 08:56:57 +02:00