Commit Graph

235 Commits

Author SHA1 Message Date
Simon Hanna f7c944acc9 Add test 2017-03-13 13:42:20 +01:00
Raoul Snyman 324652c347 Port some bugfixes from 2.4 to trunk 2017-03-09 22:42:38 -07:00
Tim Bentley 06baf5c560 fix up deploy unzip 2017-03-05 09:32:11 +00:00
Tim Bentley df77c3ebd9 add test 2017-03-04 16:51:51 +00:00
Tim Bentley 5d917de2f8 Head 2017-03-03 19:27:31 +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
Tim Bentley fe3014fc66 Add tests 2016-12-22 17:02:39 +00:00
Philip Ridout b8404dedf8 misc 2016-12-18 15:38:35 +00:00
Raoul Snyman 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
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
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
Tim Bentley 4a0330f126 Add wrapper for mediainfo 2016-01-22 20:12:46 +00:00
Tomas Groth e91520fa60 pep8 fixes 2016-01-13 22:00:46 +01:00
Ken Roberts 5a2c3e5abc Ticket 921817 - exception when connecting using PJLink authentication method
Fix incorrect location data when projector instance created.

Fix typo in getting authenticated connection salt setup.

Move salt/pin/test hash to resources file for multiple tests.

Add test for ticket 921817.

Passes local nosetests3 and pep8.

bzr-revno: 2599
2016-01-09 19:44:30 +00:00
Ken Roberts 94df2d2d86 Fix test for pjlink ticket 921817 2016-01-09 09:21:20 -08:00
Ken Roberts 8fcae33516 resolve merge conflics 2016-01-09 08:59:42 -08:00
simon.hanna@serve-me.info 04e117181d Strip whitespace from title when importing a Songbeamer song.
bzr-revno: 2596
2016-01-09 16:59:25 +00:00
Simon Hanna 8ccfde6929 Merge trunk in 2016-01-09 01:03:54 +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 345f135e98 Made sundayplus importer work with python3. Added tests. 2016-01-08 20:51:03 +01:00
Tomas Groth f2cccb90ae Fix projector tests 2016-01-07 23:07:55 +02:00
Ken Roberts a023177c4d Fix typo in projector authentication 2016-01-03 00:15:54 -08:00
Simon Hanna 96c99f3e28 Add test to check if title is stripped on Songbeamer import 2016-01-03 01:53:17 +01:00
Tim Bentley 3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Tomas Groth 89ae1ae738 Added tests for LyriX import. 2015-12-20 20:28:14 +01:00
Tomas Groth 2a4205c0a1 Migrated songselect and songbeamer tests to the SongImportTestHelper based structure. 2015-12-20 17:46:39 +01:00
Tomas Groth 037d3f4f7d Added support for author types in tests + some VideoPsalm fixes 2015-12-18 23:24:20 +01:00
Tomas Groth 6eb17b561d trunk 2015-12-18 21:13:21 +01:00
Tomas Groth 6b8178a0b4 Added support of importing VideoPsalm songbooks. 2015-12-17 22:39:52 +01:00
Samuel Mehrbrodt 0d4541b8dc Merge trunk 2015-12-11 09:33:24 +01:00
Tomas Groth d65fa351c3 Added test for zionworx file import. 2015-10-27 13:16:48 +00: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 fc3a5f27c9 Add test 2015-08-26 10:50:38 +02:00
Tomas Groth 25ce352047 Fix traceback in OSIS import on empty verse tag. 2015-07-04 23:19:13 +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 0617ce3dc9 trunk 2015-02-16 21:02:58 +00:00
Tomas Groth aef91445ca Handle OSError exception when creating files in various places. Fixes bug 1416888.
Fix parsing biblestudytools.com. Fixes bug 1418212.
Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.

bzr-revno: 2498
2015-02-14 15:11:11 +00:00
Tomas Groth 81de433df4 Added test for csvbible import 2015-02-13 23:01:07 +00:00
Tomas Groth 1e9430b435 Fix bug 1414980: Make xml parsing of presentation manager files recover if errors are encountered.
Fix bug 1414978: Set the cursor back to normal after deleting a presentation.
Fix bug 1410738: Added a cancel-button to FTW when no internet is available. 
Fix bug 1412517: Fix support for 'end' mark in bible-search.

bzr-revno: 2495
Fixes: https://launchpad.net/bugs/1414978, https://launchpad.net/bugs/1414980, https://launchpad.net/bugs/1410738, https://launchpad.net/bugs/1412517
2015-02-10 21:24:33 +02:00
Tomas Groth 5b717db63a Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.
Fixes: https://launchpad.net/bugs/1417033
2015-02-02 20:40:31 +00:00
Ken Roberts 93ce2caf34 Fix invalid call to QMessageBox() when user wants to delete user-defined source text.
bzr-revno: 2491
2015-01-31 14:18:19 +00:00
Tomas Groth 4c53cb5184 Added tests 2015-01-29 20:54:06 +00: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
Ken Roberts 44bf096bbb Source edit form button test 2015-01-18 20:24:45 -08:00
Raoul Snyman ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Ken Roberts 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 4ed9e9a722 Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar.
Fix for loading songs with linked audio + test. Fixes bug 1398403
Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden.
When cloning a song copy the mediafiles as well. Fixes bug 1309998.
Use shutil.which instead of calling which with check_output, when detecting mudraw/gs.
Moved test service files into appropriate folder.
Set the default song search to search as type.

bzr-revno: 2454
2014-12-07 08:21:37 +00:00
Tomas Groth da7ff60697 Moved test service files into appropriate folder. 2014-12-06 21:05:45 +00:00
Tomas Groth 304c489cd7 Add test for loading song with linked audio 2014-12-03 22:27:09 +00:00
Tomas Groth 80a8434458 Added one more test for song db upgrade 2014-11-25 15:11:18 +01:00
Tomas Groth 4ca013e211 Added test for song db upgrade 2014-11-25 12:25:41 +01:00
Tomas Groth 9b517cd569 Improved support for verseorder in WA import 2014-11-11 11:38:24 +01:00
Tomas Groth 02a159bf65 Added one more test file for WoW import 2014-11-05 14:04:43 +01:00
Tomas Groth 51f4539822 Added test for Word of Worship import 2014-11-03 15:36:27 +01:00
Tomas Groth 74b582032f Fix theme import in windows. Test included. 2014-10-31 13:01:07 +01:00
Ken Roberts d08594ab55 Upstream changes 2014-10-21 18:27:01 -07:00
Samuel Mehrbrodt 674cf930ef Update jQuery and jQuery Mobile
bzr-revno: 2426
2014-10-21 22:07:19 +01:00
Tomas Groth 5ecbfa61fd Fix tests so they can run individually.
Fix for importing custom tags from openlyricsxml.
Fixed console popping up on windows when running mudraw.exe.
Added oxps as supported presentation filetype (by mudraw).

bzr-revno: 2425
2014-10-21 22:06:02 +01:00
Samuel Mehrbrodt 806bb5973e Merge trunk 2014-10-13 19:40:12 +02:00
Samuel Mehrbrodt 637c0060f9 Add test 2014-10-13 13:38:13 +02:00
Ken Roberts 7545fb534f Fix changed imports in mockups 2014-10-06 14:19:08 -07:00
Ken Roberts 0227e0a2bd Initial projector code 2014-10-06 12:10:03 -07:00
Tomas Groth 9b8b114a59 Fixed the new test. 2014-09-25 21:31:31 +01:00
Tomas Groth 4bacaab205 trunk 2014-09-21 20:23:40 +01:00
Tomas Groth dab4ad7080 trunk 2014-09-08 22:08:49 +01:00
Tomas Groth 98d5ed7acf Fix the OSIS bible importer
bzr-revno: 2418
2014-09-06 07:44:08 +01:00
Tomas Groth 36326085f8 trunk 2014-08-26 22:19:08 +01:00
Tomas Groth c50619212d trunk 2014-08-25 21:34:54 +01:00
Tomas Groth 3101d72b48 Rewrote OSIS import, added tests. 2014-08-24 15:40:45 +01:00