raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
15,360 Commits 5 Branches 0 Tags 296 MiB
4b1965520c
Commit Graph

429 Commits

Author SHA1 Message Date
Gary Talent
5209daab45 Update to trunk. 2017-03-29 16:40:54 -05:00
Raoul Snyman
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
e97c157a19 Add comment 2017-03-13 13:43:55 +01:00
Simon Hanna
f7c944acc9 Add test 2017-03-13 13:42:20 +01:00
Raoul Snyman
4bae0fcd69 Fix up two tests 2017-03-10 15:48:59 -07:00
Raoul Snyman
324652c347 Port some bugfixes from 2.4 to trunk 2017-03-09 22:42:38 -07:00
Raoul Snyman
094b1f73bc Fix a test 2017-03-01 21:43:45 -07:00
Tomas Groth
dbdc4a6712 Made to possible to disable chord support completely. Now everything between [ and ] is considered a chord. 2017-02-26 22:14:49 +01:00
Tomas Groth
56d2eaa4c2 trunk 2017-01-25 22:17:27 +01:00
second@tgc.dk
df668fde84 Clean search lyrics for formatting tags. Fixes bug #1655988. 
Fix an issue with easyslide import not handling verse order correctly. Fixes bug #1655985.
Improve the songbeamer encoding detection. Fixes bug #1530597.
Handle a few videopsalm quirks. Fixes bug #1652851.

bzr-revno: 2718
 2017-01-20 21:42:01 +00:00
Tomas Groth
02ee7ac7dc Fix an issue with easyslide import not handling verse order correctly. 2017-01-12 22:31:01 +01:00
Olli Suutari
1c2ea31112 - Merged trunk on 8.1.17 2017-01-08 21:12:12 +02:00
Tim Bentley
74ca42e220 Yet another year goes by 2016-12-31 11:01:36 +00:00
Olli Suutari
a9520ced68 - Merged trunk on 23.12.16 2016-12-23 22:16:24 +02:00
Tomas Groth
d1bca6d52a trunk 2016-12-23 10:14:22 +01:00
Raoul Snyman
3639785151 Fix bug #1642684 by rather just setting the edit text to a blank string 
Fixes: https://launchpad.net/bugs/1642684
 2016-12-15 16:11:42 +02:00
Olli Suutari
01029c8d65 - Added a test for checking hidden "Written by" text. 2016-12-04 05:08:56 +02:00
Olli Suutari
f3ce137233 - Merged trunk on 4.12.16 2016-12-04 00:48:30 +02:00
Tomas Groth
5468def937 pep8 fixes 2016-11-15 22:13:52 +01: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
Olli Suutari
2f8a5ba906 - Fixed the test 2016-09-18 23:15:33 +03:00
Tomas Groth
32cfacff7e Skip MediaShout import testing on non-win platforms. 2016-09-18 17:47:59 +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
Tomas Groth
825a703cd0 pep8 fixes 2016-08-19 17:05:44 +02: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
Raoul Snyman
b657d255cc Remove blank line 
Fixes: https://launchpad.net/bugs/1547964
 2016-08-14 22:58:27 +02:00
Raoul Snyman
693c18a23a Add some tests for the MediaShout importer 2016-08-14 22:48:36 +02:00
Raoul Snyman
2bd58e1c29 Fix some pep8 issues 2016-08-13 16:41:24 +02:00
Raoul Snyman
879a51a1fe Fix the tests for SongSelect and write tests for the SystemPlayer 2016-08-13 16:29:12 +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
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
Tomas Groth
0c2b68ac54 merge trunk 2016-06-14 23:12:54 +02:00
Tomas Groth
e89803a3ad merge trunk 2016-06-14 21:06:54 +02:00
Tomas Groth
2fe7a9d127 trunk 2016-06-08 21:27:52 +02:00
Tomas Groth
3d98d60d59 Implement chord transposing in the lyrics editor. 2016-06-07 22:21:21 +02:00
Raoul Snyman
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
Ian Knight
47da0a1c8b Fixed PEP8 Errors 2016-06-02 20:02:34 +09:30
Raoul Snyman
ec8ace4929 Fixed up some issues and refactored a method that wasn't actually a test. 2016-06-02 01:14:58 +02:00
Raoul Snyman
caeb3d3ff7 Found the other tests, Mom! 2016-06-01 23:42:54 +02:00
Raoul Snyman
672b8334fa Initial attempt to move to nose2 2016-05-31 23:40:13 +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
Samuel Mehrbrodt
9cd49f194f PEP8 2016-04-29 19:32:09 +02:00
Samuel Mehrbrodt
868b538dd2 Fix test and add new one 2016-04-29 19:10:50 +02:00
Raoul Snyman
60f3ae195c Forgot to add the test file 2016-04-27 23:23:16 +02:00
Chris Hill
bb15b4ce71 merge w/ trunk 2016-04-25 11:54:08 +01:00
Gabriel Loo
caa9c59c75 Added unit tests for SongSelect Importer search 2016-04-17 18:55:40 -04:00
Chris Hill
0c8f9e3b71 Removed auto-select for searches where multiple IDs selected, added tests to hide temporary songs 2016-04-17 22:22:30 +01:00
Tomas Groth
2aeb7f9e6f trunk 2016-04-10 22:24:07 +02:00
chris@minkus.me.uk
5a3e5c655c Fixes bug #1280295 - 'Enable natural sorting for song book searches' using get_natural_key 
Now also includes natural sorting for author, topic, theme & CCLI number as well
Also refactors Songbook Search to make the database do filtering for performance rather than querying all then filtering
I've tested it on my database of 500-odd songs and it seems a little faster
Includes unit tests

--------------------------------
lp:~minkus/openlp/naturalsortsongs (revision 2519)
[SUCCESS] https://ci.op...

bzr-revno: 2637
Fixes: https://launchpad.net/bugs/1280295
 2016-04-03 16:57:52 +01:00
Chris Hill
330a1758c8 Use get_natural_key instead of _natural_sort_key 2016-04-03 11:57:39 +01:00
Ian Knight
573bc510ff Added ProPresenter 5 & 6 support 2016-03-31 03:41:52 +10:30
Chris Hill
8de2f013eb merge w/ trunk 2016-03-28 12:52:59 +01:00
Tomas Groth
7c6e1902c4 Fix tag detection. Fixes bug 1549549. 
Fixes: https://launchpad.net/bugs/1549549
 2016-03-22 22:08:56 +01:00
Tomas Groth
45b122f768 make stuff prettier... 2016-03-20 09:28:41 +01:00
Tomas Groth
dca65148c4 forgot to add a file and made some pep8 fixes 2016-03-19 21:42:59 +01:00
Tomas Groth
2937f39999 trunk 2016-03-19 21:30:12 +01:00
Chris Hill
9c5da3d196 merge w/ trunk 2016-03-19 15:09:50 +00:00
Chris Hill
bb0adc6f5d fixed bug #1280295 'Enable natural sorting for song book searches', refactored to move filtering to database, updated test 
Fixes: https://launchpad.net/bugs/1280295
 2016-03-19 15:01:10 +00: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
faa434d937 pep8 fixes 2016-03-13 19:37:08 +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
98eb50e9b2 Made the anchor/tag detection more generic. 2016-03-08 22:43:10 +01:00
Tomas Groth
e67ad21740 Getting closer... 2016-03-07 23:27:28 +01:00
Chris Hill
57200fa84e merge with trunk 2016-02-19 20:28:39 +00:00
Tomas Groth
4c883c8cf0 Remove songs used in tests that is not in public domain. 2016-02-15 21:49:23 +01:00
Chris Hill
41d627e3f9 natural sort lower case 2016-02-13 16:57:09 +00:00
Chris Hill
76e7faf1aa Remove _try_int function - spurious 2016-02-07 09:27:28 +00:00
Chris Hill
f23e2dfb46 update from trunk, works in 2.4 2016-02-06 17:50:58 +00:00
s.mehrbrodt@gmail.com
8fbd431bed Fix entering Songbooks with keyboard 
Also clear songbook entry field when editing another song

lp:~sam92/openlp/bug-1537212 (revision 2611)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1273/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1197/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1136/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/972/
Stopping after failure

bzr-revno: 2612
Fixes: https://launchpad.net/bugs/1537212
 2016-01-30 20:41:22 +00:00
Samuel Mehrbrodt
0f1c7bae44 Add test 2016-01-30 15:13:35 +01: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
springermac@gmail.com
e6959992f9 Fix Mac OS X display flags test 
Fix import in pjlink tests
Skip OpenOffice test if uno isn't available, e.g., on Mac OS X

bzr-revno: 2604
 2016-01-11 21:27:11 +01:00
Jonathan Springer
a9df7771f6 Skip OpenOffice test if uno isn't available 2016-01-10 17:09:18 -05:00
Simon Hanna
4d7ceba301 Merge with trunk 2016-01-10 17:01:43 +01:00
Simon Hanna
0f1d6718bd Add tests for ignored case 2016-01-10 01:34:53 +01:00
Simon Hanna
70e1f3926b Add test for fix 2016-01-10 01:18:27 +01:00
s.mehrbrodt@gmail.com
ad37560ecd lp:~sam92/openlp/multiple-songbooks (revision 2607) 
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1226/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1151/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1090/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/928/
Stopping after failure

bzr-revno: 2600
 2016-01-09 19:53:09 +00:00
Raoul Snyman
a4391bd6e3 HEAD 2016-01-09 20:01:49 +02:00
Simon Hanna
0416e29a83 Merge with trunk 2016-01-09 17:50:08 +01:00
Simon Hanna
afaf54a142 Fix pep8 errors 2016-01-09 17:26:14 +01:00
Samuel Mehrbrodt
2785fbaa2d Fix tests 2016-01-09 16:53:49 +01:00
Samuel Mehrbrodt
ad5246fc4a songbookentry -> songbook_entry, mock_song -> song 2016-01-09 16:23:11 +01:00
Samuel Mehrbrodt
fe74a19783 Merge 2016-01-09 16:04:34 +01:00
Tomas Groth
e9e845035a pep8 fixes 2016-01-09 10:09:29 +01:00
Simon Hanna
21c6a3ff1c Merge with trunk 2016-01-09 01:07:15 +01:00
Samuel Mehrbrodt
da5790f17f Merge trunk 2016-01-09 00:05:43 +01:00
Tomas Groth
5d6758ffaf trunk 2016-01-08 22:51:40 +01:00
Tomas Groth
b5270b48a9 Fix for easyslide importer and added test. 2016-01-08 22:42:36 +01:00
Tomas Groth
21b8388069 Small cleanup of videopsalm 2016-01-08 20:52:24 +01:00
Tomas Groth
345f135e98 Made sundayplus importer work with python3. Added tests. 2016-01-08 20:51:03 +01:00
Tim Bentley
7fd37c1033 head 2016-01-08 17:44:47 +00:00