9f8433a18e
Merge trunk
2017-06-01 15:36:38 -07:00
Tomas Groth
4a3e4e1ad4
Fix songshowplus encoding issue.
2017-05-30 22:05:18 +02:00
3ea37800b7
Fix db.Manager upgrade/PJlink2 update D
2017-05-27 11:21:24 -07:00
Gary Talent
549ec886a5
Add support for importing EasyWorship 6 databases
...
bzr-revno: 2741
Fixes: https://launchpad.net/bugs/1675641
2017-05-22 12:07:07 -07:00
cb5c0f82a3
PJlink class 2 updates C
2017-05-19 22:51:58 -07:00
5c161eb541
Added old pjlink1 database to test resources
2017-05-19 09:22:52 -07:00
Tomas Groth
eec5542474
Added support for chords in Chord Pro format (using brackets), with support for chord transposing and 3 different notations.
...
Added support for import of song in ChordPro file format
Added support for importing chords and verseorder from songbeamer.
Add support for export and import of chords in openlyrics
Added support for importing chords from opensong.
Added support for importing chords from videopsalm.
Added support for printing chords.
bzr-revno: 2735
2017-05-17 21:30:47 +01:00
Tomas Groth
ad94e7c19f
Added some more comments for songbeamer import and added support for author type.
2017-05-11 21:53:47 +02:00
97b2d632c0
Test data for pjlink2 update
2017-05-07 03:15:10 -07:00
Tomas Groth
fa9cdc5b94
Added songbeamer chord import test
2017-04-17 21:35:34 +02:00
Tomas Groth
111cff72a1
trunk
2017-04-11 10:05:13 +02:00
Gary Talent
5209daab45
Update to trunk.
2017-03-29 16:40:54 -05:00
4183f186ce
Various fixes and things:
...
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
...
bzr-revno: 2728
2017-03-24 19:33:45 -07:00
Tomas Groth
31ee3999c0
merge lastest trunk
2017-03-15 20:51:10 +01:00
Simon Hanna
f7c944acc9
Add test
2017-03-13 13:42:20 +01:00
324652c347
Port some bugfixes from 2.4 to trunk
2017-03-09 22:42:38 -07:00
Tim Bentley
df77c3ebd9
add test
2017-03-04 16:51:51 +00:00
Philip Ridout
162c178d6e
HEAD
2017-02-18 07:23:15 +00:00
Tomas Groth
56d2eaa4c2
trunk
2017-01-25 22:17:27 +01:00
Tomas Groth
02ee7ac7dc
Fix an issue with easyslide import not handling verse order correctly.
2017-01-12 22:31:01 +01:00
Tomas Groth
32d3c0038e
Handle a few videopsalm quirks
2017-01-12 22:03:06 +01:00
Tim Bentley
74ca42e220
Yet another year goes by
2016-12-31 11:01:36 +00:00
Tomas Groth
d1bca6d52a
trunk
2016-12-23 10:14:22 +01:00
Philip Ridout
b8404dedf8
misc
2016-12-18 15:38:35 +00:00
d0ed37e1d5
Move contents of html files into actual html files
2016-11-25 16:17:34 +02:00
Tomas Groth
bbc670cc36
trunk
2016-11-15 21:53:50 +01:00
Tomas Groth
88519e2cc1
Added a test for chordpro import.
2016-09-25 21:27:46 +02:00
Gary Talent
5435dfc5cc
Add test for EasyWorship 6 importer.
2016-09-16 23:39:40 -05:00
Gary Talent
b5f08bf54c
Add support for importing EasyWorship6 databases
2016-09-07 00:15:37 -05:00
Philip Ridout
14187f4884
Mostly refactors of OSIS + tests
2016-09-02 15:23:20 +01:00
Tomas Groth
c463c46cf6
Fixed various bugs in the songbeamer chord import, and added a test.
2016-08-19 16:51:23 +02:00
Tomas Groth
25c268145a
merge trunk
2016-08-18 21:04:44 +02:00
Tomas Groth
de54ec2715
merge trunk
2016-07-25 22:48:30 +02:00
Tomas Groth
611c970eb0
More work on chords
2016-07-25 22:07:07 +02:00
Tomas Groth
8009bfef85
forgot test file
2016-07-07 22:48:52 +02:00
Tomas Groth
69951133fe
Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.
...
Fixes: https://launchpad.net/bugs/1594945
2016-07-07 22:47:57 +02:00
second@tgc.dk
45d2640159
"Fix various pyodbc related issues. Fixes bug 1590657.
...
Fix of tracback during SongPro import. Fixes bug 1582152.
Fix traceback during songshowplus import. Fixes bug 1585489.
Skip PresentationManager files we do not support."
bzr-revno: 2677
Fixes: https://launchpad.net/bugs/1582152 , https://launchpad.net/bugs/1585489 , https://launchpad.net/bugs/1590657
2016-06-16 22:12:27 +02:00
0d2745a1d1
Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left.
2016-06-07 09:35:06 +02:00
Tomas Groth
fd4cfd1eaa
Fix traceback during songshowplus import. Fixes bug 1585489.
...
Fixes: https://launchpad.net/bugs/1585489
2016-05-25 09:04:41 +02:00
Tim Bentley
a41d86cb7c
Head
2016-04-06 06:08:44 +01:00
Ian Knight
573bc510ff
Added ProPresenter 5 & 6 support
2016-03-31 03:41:52 +10:30
Tomas Groth
dca65148c4
forgot to add a file and made some pep8 fixes
2016-03-19 21:42:59 +01:00
Tomas Groth
7b69634552
Fixes for translation support + test
2016-03-19 07:20:12 +01:00
Tomas Groth
fdc22b4e4c
Add translations support
2016-03-18 23:09:49 +01:00
Tomas Groth
302fcb221b
Added another OPS Pro import test
2016-03-16 22:28:29 +01:00
Tomas Groth
e9e5976d22
Finished first test.
2016-03-11 22:56:07 +01:00
Tomas Groth
51ffb92d40
Started work on tests
2016-03-09 22:44:15 +01:00
Tomas Groth
4c883c8cf0
Remove songs used in tests that is not in public domain.
2016-02-15 21:49:23 +01:00
Tim Bentley
ea40173f9b
new start
2016-02-13 13:13:00 +00:00
Tomas Groth
c1108b1593
Fix traceback where OpenSong importer crashed if non-numbers were in the CCLI field.
2016-01-23 09:19:12 +01:00