Commit Graph

1772 Commits

Author SHA1 Message Date
Raoul Snyman 63139e8c3b Just check for the tracks table before importing from it. 2010-09-06 22:41:11 +02:00
Raoul Snyman f82513f11d Finally done the openlp.org 1.x song importer. 2010-09-06 22:33:28 +02:00
Raoul Snyman 5e61bf938e HEAD 2010-09-06 20:05:08 +02:00
Jonathan Corwin aa0f4f7af0 Finish wizard integration 2010-09-05 16:16:48 +01:00
Jonathan Corwin 3d550e383c Head 2010-09-05 15:18:38 +01:00
Tim Bentley e2c117034a Fix up bug for bible settings of duel drop down
Fixes: https://launchpad.net/bugs/629848
2010-09-04 20:40:28 +01:00
Tim Bentley da64f5147c Head1011 2010-09-04 19:14:51 +01:00
Raoul Snyman a44ae94de7 HEAD 2010-09-04 19:53:10 +02:00
Raoul Snyman 2901c79ed6 Start work on the openlp.org 1.x importer.
Add a couple of fixes to the song import.
Add a few fixes to the OpenSong importer.
2010-09-04 19:51:41 +02:00
Tim Bentley 20844c8d28 Fix CCLI for songs
Fixes: https://launchpad.net/bugs/622894
2010-09-04 18:39:03 +01:00
Philip Ridout 163bf9d2f4 Corrected one line that was missed (not by me :-p) 2010-09-04 15:26:04 +01:00
Tim Bentley 04cfa6a730 Move spell and tag dialog to it"s own file 2010-09-04 09:12:54 +01:00
Raoul Snyman 5432daae57 Fix for bug #621695.
bzr-revno: 1004
2010-09-03 08:29:29 +02:00
Andreas Preikschat b138a4c1e8 Improved dual Bible handling, fixed some edge-case bugs, including bug #625997.
bzr-revno: 1003
2010-09-03 08:26:43 +02:00
Raoul Snyman a37fafa722 Fix the name of the keyword argument. 2010-09-03 07:33:03 +02:00
Derek Scotney 56b5a037ae Conflicts resolved 2010-09-01 22:20:27 +02:00
Derek Scotney 9ed0df5023 Removed unnecessary commented out lines 2010-09-01 21:31:16 +02:00
Derek Scotney ce73d86e0a More code convention corrections 2010-09-01 21:27:45 +02:00
Andreas Preikschat cadfefe616 opps.. forgot the %s 2010-09-01 21:22:55 +02:00
Andreas Preikschat b21e164fd3 added permission to footer 2010-09-01 19:54:10 +02:00
Andreas Preikschat 80851ddfc4 added permission, changed formattig 2010-09-01 19:27:38 +02:00
Philip Ridout 7e0245344a Adding the Words of Worship importer.
bzr-revno: 1001
2010-09-01 07:11:31 +02:00
Derek Scotney 5734c3052a Code convention corrections 2010-08-31 21:01:55 +02:00
Andreas Preikschat 60ced9e184 moved some code 2010-08-31 20:28:21 +02:00
Derek Scotney 83c5ee3450 Removed openlp/plugins/songs/lib/.directory 2010-08-30 22:42:07 +02:00
Derek Scotney 590aef4a87 Corrected docstring lengths 2010-08-30 20:32:00 +02:00
Raoul Snyman 2d9b39986a Some more fixes for the OpenSong import. 2010-08-29 22:05:36 +02:00
Derek Scotney d3ee43965f Change comments to reStructuredText format 2010-08-29 20:24:09 +02:00
Raoul Snyman 130e315333 HEAD 2010-08-29 19:54:36 +02:00
Andreas Preikschat 31aba2eadb removed commented lines, name change 2010-08-29 18:20:56 +02:00
Andreas Preikschat 1911972177 head 2010-08-29 15:07:10 +02:00
Andreas Preikschat 9fc45065fc removed unnecessary line 2010-08-29 14:58:40 +02:00
Andreas Preikschat 87db3e98e6 clean ups, tweaks, fixed 625997 2010-08-29 14:49:45 +02:00
Jon Tibble 9a1ed78fd5 Cleanups 2010-08-29 00:52:10 +01:00
Raoul Snyman 59d2e2dab6 Fixed up the OpenSong importer. 2010-08-29 01:09:05 +02:00
Philip Ridout 271bbe22b2 Made the constants more like constants! 2010-08-28 21:46:03 +01:00
Jon Tibble 0abf1597eb Fix trunk merging 2010-08-28 20:54:50 +01:00
Raoul Snyman 7fcd2512ce HEAD 2010-08-28 21:49:12 +02:00
Andreas Preikschat beaac2d923 removed everything which cannot work 2010-08-28 21:41:06 +02:00
Jon Tibble 168033566a Head r997 2010-08-28 20:40:27 +01:00
Jon Tibble 066a97f4d7 Really fix song maintenance as subform (Bug #612282) 2010-08-28 20:32:24 +01:00
Andreas Preikschat 37b2b1bb9d clean up 2010-08-28 21:28:50 +02:00
Andreas Preikschat de3659bc92 commented everything out, which cannot work (currently) 2010-08-28 21:17:52 +02:00
Andreas Preikschat 521b06ee8c clean up - not working 2010-08-28 20:56:46 +02:00
Andreas Preikschat 36e2f2e33f fixed stuff messed up resolvesing the conflict 2010-08-28 19:32:44 +02:00
Andreas Preikschat 14dbfaa4b5 fixed stuff messed up resolvesing the conflict 2010-08-28 19:10:14 +02:00
Andreas Preikschat 8071a65720 head 2010-08-28 19:05:45 +02:00
Tim Bentley 618813f020 Display and renderer changes
bzr-revno: 997
2010-08-28 17:35:16 +01:00
Tim Bentley 5ba4de64ca String fixes 2010-08-28 16:49:51 +01:00
Derek Scotney 81b53ee21b Changs to comment formatting 2010-08-28 15:27:17 +02:00