lp:~phill-ridout/openlp/1096450_2.0

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.0 at revision 2153

Raoul Snyman: Approve on 2013-08-13

matysek (community): Approve on 2013-08-13

Tim Bentley: Approve on 2013-08-04

Diff: 46 lines (+7/-6)

1 file modified

openlp/plugins/songs/lib/opensongimport.py (+7/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1096450: Opensong Import - some lines missing

Medium

Fix Released

Link a bug report

Related blueprints

2152. By Phill on 2013-08-04

Fixes #1096450 Stripping the leading and trailing spaces at the end rather than begginning (the space means something, see added comments)
Semi-colons (;) denotes comments ONLY when it is the first char of the line ie the whole line is a comment
Finally fixed an issue when a verse was being added to the verse order multiple times, thus repeating it over and over and ....

2151. By Phill on 2013-07-31

changed skip_song to save_song & changed logic arround

2150. By Phill on 2013-07-31

Fixed #1204629 so that typing an image path actually changes the background.
Made the page validation more robust by including the fileDialog

2149. By Tim Bentley on 2013-07-11

Fix two small but nasty bugs. Screen width must be > 0 and an image theme must be a file

2148. By Tim Bentley on 2013-07-09

Fix type error for tags

2147. By Tomas Groth on 2013-07-05

Migrate service files from pickle to json and replace osd with osj

2146. By Tim Bentley on 2013-06-30

move formatting tags to json from pickle

2145. By Andreas Preikschat on 2013-06-21

- fixes bug #1170435 (We should not warn when verse order is empty)

2144. By Andreas Preikschat on 2013-06-16

Increased possible min/max line spacing

2143. By Andreas Preikschat on 2013-04-29

updated ts files