Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-07-17 Thread Tim Bentley
Review: Approve -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/173403 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net

[Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-07-17 Thread Tim Bentley
The proposal to merge lp:~phill-ridout/openlp/1114457 into lp:openlp has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/173403 -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/173403 Your

[Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-07-17 Thread noreply
The proposal to merge lp:~phill-ridout/openlp/1114457 into lp:openlp has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/173403 -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/173403 Your team

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-07-11 Thread Raoul Snyman
Review: Approve -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/173403 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-07-07 Thread Phill
Sorry, didn't even see your comment! I'll get to it! -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/173315 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to :

[Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-07-07 Thread Phill
Phill has proposed merging lp:~phill-ridout/openlp/1114457 into lp:openlp with lp:~googol/openlp/bug-1116528 as a prerequisite. Requested reviews: Tim Bentley (trb143) Raoul Snyman (raoul-snyman) Andreas Preikschat (googol) Related bugs: Bug #1114457 in OpenLP: Easy Worship importer

[Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-07-06 Thread Phill
Phill has proposed merging lp:~phill-ridout/openlp/1114457 into lp:openlp with lp:~googol/openlp/bug-1116528 as a prerequisite. Requested reviews: Tim Bentley (trb143) Raoul Snyman (raoul-snyman) Andreas Preikschat (googol) Related bugs: Bug #1114457 in OpenLP: Easy Worship importer

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-07-06 Thread Raoul Snyman
Review: Approve Please run bzr tag --delete 2.2.2 on your branch and then push it up again. -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/173315 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list:

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-07-05 Thread Raoul Snyman
Review: Needs Fixing == ERROR: Test the :mod:`doImport` module opens the correct files -- Traceback (most recent call last): File

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-06-29 Thread Raoul Snyman
Review: Needs Fixing 180 +TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), u'../../../resources/easyworshipsongs')) You need to use os.path.join with each part of that path separately: TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), u'..', u'..',

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-06-28 Thread Andreas Preikschat
Review: Needs Fixing 41 - if not os.path.isfile(self.import_source): 42 - return 43 - if not os.path.isfile(import_source_mb): 44 + if not (os.path.isfile(self.import_source) or os.path.isfile(import_source_mb)) Should be: if not os.path.isfile(self.import_source) or

[Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-06-28 Thread Phill
Phill has proposed merging lp:~phill-ridout/openlp/1114457 into lp:openlp with lp:~googol/openlp/bug-1116528 as a prerequisite. Requested reviews: Tim Bentley (trb143) Andreas Preikschat (googol) Raoul Snyman (raoul-snyman) Related bugs: Bug #1114457 in OpenLP: Easy Worship importer

[Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-06-27 Thread Phill
Phill has proposed merging lp:~phill-ridout/openlp/1114457 into lp:openlp with lp:~googol/openlp/bug-1116528 as a prerequisite. Requested reviews: Andreas Preikschat (googol) Tim Bentley (trb143) Raoul Snyman (raoul-snyman) Related bugs: Bug #1114457 in OpenLP: Easy Worship importer

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-06-14 Thread Andreas Preikschat
Will you continue to work on this? -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/159986 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to :

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-04-27 Thread Tim Bentley
Review: Needs Fixing Lines 8-17 Tests also fail http://ci.openlp.org/view/Specific%20Branch/job/OpenLP-Pull_and_Run_Functional_Tests/87/console -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/159986 Your team OpenLP Core is subscribed to branch lp:openlp.

[Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-04-21 Thread Phill
Phill has proposed merging lp:~phill-ridout/openlp/1114457 into lp:openlp with lp:~googol/openlp/bug-1116528 as a prerequisite. Requested reviews: Raoul Snyman (raoul-snyman) Andreas Preikschat (googol) Related bugs: Bug #1114457 in OpenLP: Easy Worship importer progress bar is out

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-04-18 Thread Andreas Preikschat
Review: Needs Fixing self.type = field_type Please rename the attribute as well. -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/159502 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list:

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-04-17 Thread Raoul Snyman
Review: Needs Fixing 125 +TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), u'../../../resources/easyworshipsongs')) 126 +SONG_TEST_DATA = [{u'title': u'Amazing Grace', Why are these constants below some other classes? --

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-04-17 Thread Phill
Because I wanted to keep the constants together. -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/159202 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to :

[Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-04-17 Thread Phill
Phill has proposed merging lp:~phill-ridout/openlp/1114457 into lp:openlp with lp:~googol/openlp/bug-1116528 as a prerequisite. Requested reviews: Raoul Snyman (raoul-snyman) Andreas Preikschat (googol) Related bugs: Bug #1114457 in OpenLP: Easy Worship importer progress bar is out

[Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-04-16 Thread Phill
Phill has proposed merging lp:~phill-ridout/openlp/1114457 into lp:openlp with lp:~googol/openlp/bug-1116528 as a prerequisite. Requested reviews: Andreas Preikschat (googol) Raoul Snyman (raoul-snyman) Related bugs: Bug #1114457 in OpenLP: Easy Worship importer progress bar is out

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-03-13 Thread Andreas Preikschat
Any progress on this? -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/152367 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-03-13 Thread Andreas Preikschat
Any progress on this? Oh sorry, your proposal isn't that old. (I am just checking the old proposals.) -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/152367 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list:

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-03-09 Thread Andreas Preikschat
Review: Needs Fixing You have a conflict: Text conflict in openlp/plugins/songs/lib/ewimport.py -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/152367 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list:

[Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-03-08 Thread Andreas Preikschat
Andreas Preikschat has proposed merging lp:~phill-ridout/openlp/1114457 into lp:openlp with lp:~googol/openlp/bug-1116528 as a prerequisite. Requested reviews: Andreas Preikschat (googol) Related bugs: Bug #1114457 in OpenLP: Easy Worship importer progress bar is out

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-03-08 Thread Andreas Preikschat
Review: Approve -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/152367 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-03-08 Thread Raoul Snyman
Review: Approve Looks OK to me, but I don't have an EW database to test it on. -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/152367 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list:

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-03-08 Thread Andreas Preikschat
@Raoul: dropbox -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/152367 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-03-07 Thread Andreas Preikschat
Review: Resubmit -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/151080 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net

Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-03-03 Thread Raoul Snyman
Don't forget to resubmit your merge proposal to include the newer revisions. -- https://code.launchpad.net/~phill-ridout/openlp/1114457/+merge/151080 Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/1114457 into lp:openlp.

[Openlp-core] [Merge] lp:~phill-ridout/openlp/1114457 into lp:openlp

2013-02-28 Thread Phill
Phill has proposed merging lp:~phill-ridout/openlp/1114457 into lp:openlp with lp:~googol/openlp/bug-1116528 as a prerequisite. Requested reviews: OpenLP Core (openlp-core) Related bugs: Bug #1114457 in OpenLP: Easy Worship importer progress bar is out