Samuel Mehrbrodt
0d4541b8dc
Merge trunk
2015-12-11 09:33:24 +01:00
Jonathan Springer
285e12bc9d
PEP8
2015-11-06 20:09:32 -05:00
Jonathan Springer
7af1ca1d49
Migrate to PyQt5
2015-11-06 19:49:40 -05:00
Tomas Groth
05043edb6d
Strip trailing whitespaces from verse-string.
2015-10-28 16:43:17 +00:00
Tomas Groth
fc5f2e1018
Improve the worshipcenter pro importer and updated test.
2015-10-27 15:00:11 +00:00
Tomas Groth
d65fa351c3
Added test for zionworx file import.
2015-10-27 13:16:48 +00:00
Tomas Groth
85f034abdd
Make zionwork imported work with python3
...
Fixes: https://launchpad.net/bugs/1510282
2015-10-27 12:28:13 +00:00
Jonathan Springer
6688d45108
merge trunk
2015-09-08 15:15:43 -04:00
Jonathan Springer
eaf1e7a049
Docstring cleanups
2015-09-08 15:13:59 -04:00
Tomas Groth
579f532aec
Removed unnecessary line.
2015-08-28 14:20:17 +01:00
Tomas Groth
0c24d3705b
Fix traceback on windows in the OO/LO song importer.
2015-08-28 11:22:06 +01:00
Tomas Groth
4488fedfdc
Fix SongPro import. Fixes bug 1489376.
...
Fixes: https://launchpad.net/bugs/1489376
2015-08-27 12:24:24 +01:00
Samuel Mehrbrodt
eac92737a2
Better strings for translation
2015-08-26 09:51:37 +02:00
Samuel Mehrbrodt
fce9a1e1f2
OpenLP 2.0 -> OpenLP 2
2015-08-26 09:26:19 +02:00
Tomas Groth
8b1c81f00a
Ignore Libre/OpenOffice exceptions if we are closing it.
2015-08-03 19:54:00 +01:00
Tomas Groth
4266d9cbdf
For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056.
...
Fixes: https://launchpad.net/bugs/1458056
2015-05-25 12:11:04 +01:00
Tomas Groth
39c79aaed9
PEP8 fixes
2015-03-09 20:57:39 +00:00
Tomas Groth
cf9c91f171
Fix parsing of partly broken presentation manager files on windows.
2015-01-30 21:50:36 +00:00
Tomas Groth
46ee502ad6
Fix for chardet input.
2015-01-29 21:20:36 +00:00
Tomas Groth
1b75cc9c6b
Fallback to manual encoding detection.
2015-01-29 21:15:39 +00:00
Tomas Groth
8e8228a69a
Make xml parsing of presentation manager files recover if errors are encountered. Fixes bug 1414980.
...
Fixes: https://launchpad.net/bugs/1414980
2015-01-29 15:06:44 +01:00
Phill Ridout
051db41e20
removed python3 string
2015-01-22 17:42:29 +00:00
Phill Ridout
7750f1ec11
Correct the rest of the headers
2015-01-22 13:31:25 +00:00
de213b0f66
Copyright cleanup time,
...
bzr-revno: 2479
2015-01-19 08:34:29 +00:00
ffcea13021
Updated the copyright.
2015-01-18 15:39:21 +02:00
Tomas Groth
36e4b0c8eb
Attempt to fix WorshipCenterProImport init under wine tests
2015-01-16 16:25:25 +01:00
4859e9866d
Add .bin support for CCLI file import
2015-01-11 10:37:50 -08:00
Tim Bentley
f3c09af379
Years go by
2014-12-31 10:58:13 +00:00
Tomas Groth
46641fecbe
Made the FTW able to handle if the downloaded config file is invalid (part of bug 1222944).
...
Improved FTW handling of connection issues.
Update thememanager widget after theme import.
Close song db session after import to unlock file on windows, so they can be deleted.
Fix for importing old bible DBs, like KJV
Removed old pyinstaller hooks which has been moved to the packaging branch.
When bible or song plugin is disabled in FTW don't show download for those plugins in FTW. Fixes bug 1194622.
bzr-revno: 2450
2014-12-07 08:11:59 +00:00
Tomas Groth
01cbd921e9
Open opensong files in 'rb' mode. Fixes bug 1396958
...
Fixes: https://launchpad.net/bugs/1396958
2014-11-28 08:13:21 +00:00
Tomas Groth
e3bd817c5b
Merge with trunk
2014-11-26 09:04:09 +00:00
Tomas Groth
9b517cd569
Improved support for verseorder in WA import
2014-11-11 11:38:24 +01:00
Tomas Groth
0a500eeb8d
Fix for WA import with escaped characters, partial fix for bug 1390986
...
Fixes: https://launchpad.net/bugs/1390986
2014-11-10 10:25:31 +01:00
Tomas Groth
8f4ccc5426
Close db session after import to unlock file on windows
2014-11-06 14:14:05 +01:00
Tomas Groth
51f4539822
Added test for Word of Worship import
2014-11-03 15:36:27 +01:00
Tomas Groth
2ed5f2bbe4
Fix for import of Words of Worship file
2014-11-03 11:03:53 +01:00
Jonathan Springer
f3207dac8e
Consolidate platform specific checks into the common module
2014-08-27 19:18:06 -04:00
Phill Ridout
34a1ab3b3e
HEAD
2014-08-26 17:51:52 +01:00
Samuel Mehrbrodt
0bf256070a
Add test
2014-08-18 21:04:46 +02:00
Samuel Mehrbrodt
63f08f0c4a
Fix ProPresenter import
...
Fixes: https://launchpad.net/bugs/1358418
2014-08-18 20:45:15 +02:00
Samuel Mehrbrodt
d5a3651c95
Merge trunk
2014-07-14 18:48:48 +02:00
Samuel Mehrbrodt
53cb11e03e
EOF; verse order fixed
2014-07-11 16:19:53 +02:00
Samuel Mehrbrodt
b211ddd99c
Merge trunk
2014-07-07 18:21:45 +02:00
Samuel Mehrbrodt
2296be7418
Merge trunk
2014-07-07 18:16:32 +02:00
Samuel Mehrbrodt
f089e7522e
Cleanups
2014-07-04 11:35:10 +02:00
Samuel Mehrbrodt
686f8d2437
More renaming
2014-07-04 11:31:06 +02:00
