Commit Graph

485 Commits

Author SHA1 Message Date
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
simon.hanna@serve-me.info e8e553b663 Modify all forms to remove the help button from their status bar.
I don't think I missed a form. The Wizards remain untouched as the help button works there

bzr-revno: 2591
Fixes: https://launchpad.net/bugs/1490184
2016-01-08 17:26:39 +00:00
Simon Hanna d5780b9f78 update functions that were previously methods to drop the '_'
rename _child to to_str because of name conflicts
2016-01-07 14:10:31 +01:00
Simon Hanna 5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +01:00
Simon Hanna 46301b63f4 Add docstrings to tests 2016-01-05 22:35:35 +01:00
Tim Bentley 8df7c3a9ea add tests 2016-01-05 19:32:12 +00:00
Samuel Mehrbrodt 5f2e0ba0ee Add test for deleting columns in a db 2016-01-05 16:14:58 +01:00
Samuel Mehrbrodt bfdd9e81ab Extend test for multiple songbooks 2016-01-04 20:23:42 +01:00
Samuel Mehrbrodt ccd8b0625f Fix test 2016-01-04 20:20:21 +01:00
Samuel Mehrbrodt ecd2c28cc7 Add test 2016-01-04 20:14:00 +01:00
Simon Hanna c7563a5a64 Add documentation to tests 2016-01-03 00:37:22 +01:00
Tim Bentley 3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Simon Hanna 990a8a9502 Add tests for the SongFormat class 2015-12-30 22:36:37 +01:00
Raoul Snyman 9f939859b7 [Songs Plugin] Add a stop button to the SongSelect importer to stop searching. 2015-12-26 16:33:29 +02:00
Raoul Snyman 8bf871fe2b [SongSelect] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown') 2015-12-23 20:20:22 +02:00
springermac@gmail.com d9a02f6ada Migrate to PyQt5
bzr-revno: 2576
2015-12-21 21:27:10 +01:00
Jonathan Springer bee587fa67 merge trunk 2015-12-20 19:43:38 -05: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 6eb17b561d trunk 2015-12-18 21:13:21 +01:00
Samuel Mehrbrodt e6978033e9 PEP8 2015-12-17 22:43:49 +01:00
Tomas Groth 6b8178a0b4 Added support of importing VideoPsalm songbooks. 2015-12-17 22:39:52 +01:00
Samuel Mehrbrodt 020864dd26 PEP8 2015-12-17 22:28:36 +01:00
Samuel Mehrbrodt 0ce6804171 Fix pep8 2015-12-17 21:27:08 +01:00
Samuel Mehrbrodt 0d4541b8dc Merge trunk 2015-12-11 09:33:24 +01:00
Jonathan Springer 3b3c8a35b6 merge trunk 2015-11-29 17:57:37 -05:00
Tomas Groth be222ca597 Fix tests that fails on py35. 2015-11-25 22:47:56 +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 f712b35b08 pep8 fixes 2015-10-27 22:36:52 +00:00
Tomas Groth a8c5f8cb52 Make test windows-only, again. 2015-10-27 15:15:22 +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 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 8b1c81f00a Ignore Libre/OpenOffice exceptions if we are closing it. 2015-08-03 19:54:00 +01:00
Tomas Groth 5444614ced Added songselect login except test 2015-06-24 21:26:52 +01:00
Chris Hill c95ca007b5 updated unit test 2015-06-20 23:35:22 +01:00
Chris Hill ed9146ae06 fixed bug #1000729 'Support more song fields in the search' - added unit tests
Fixes: https://launchpad.net/bugs/1000729
2015-06-14 21:58:56 +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
Raoul Snyman 02128c85f0 Fix bug #1437771: Clear the song after every import
- Set processed song to None after importing
- Update tests to check that song is None after importing
- Remove tests that were testing OptionParser, and replace with tests testing parse_options()
- Fix some docstring typos causing some tests to have a name of " (yes, a single double-quote)

Fixes: https://launchpad.net/bugs/1437771
2015-03-31 22:58:51 +02:00
Raoul Snyman 88ceae517a Fix code analysis 2015-03-02 21:21:41 +02:00
Oliver Wieland 408dd440ce Fix bug #1424555 by setting the verse and not allowing it to change
bzr-revno: 2516
Fixes: https://launchpad.net/bugs/1424555
2015-02-28 20:46:31 +02:00
Raoul Snyman e14c03166d Minor style fixes 2015-02-28 01:02:19 +02:00
Raoul Snyman f843e5a8a0 HEAD 2015-02-28 00:30:47 +02:00
Raoul Snyman 7d7fec194e Fix bug #1423699 so that you're not logged out when you want to import more songs.
Fixes: https://launchpad.net/bugs/1423699
2015-02-28 00:28:24 +02:00
Oliver Wieland 6aff21c784 Changed test descrition 2015-02-27 20:33:49 +01:00
Oliver Wieland 07c997817d added test 2015-02-23 19:30:45 +01:00
Ken Roberts e0c44c4b9f Rename test to match file import type 2015-02-18 14:39:02 -08:00
Ken Roberts 872d5b9d26 Fix duplicate test names 2015-02-18 14:04:29 -08: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 2cdc1b2fe4 Remove print 2015-02-06 22:21:01 +00:00
Tomas Groth 1b75cc9c6b Fallback to manual encoding detection. 2015-01-29 21:15:39 +00:00
Tomas Groth 4c53cb5184 Added tests 2015-01-29 20:54:06 +00:00
Philip Ridout c43823a2b0 Fixes the copyright headers
bzr-revno: 2484
2015-01-22 19:46:04 +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
Tomas Groth f53187e26a Fix layout in player-settings. Fixes bug 1410772
Make sure we use dnd position if available. Fixes bug 1410843.
Set the default delay-spinbox value from the appropriate setting. Fixes bug 1411765.
Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175.

bzr-revno: 2482
2015-01-21 20:35:36 +00:00
Raoul Snyman de213b0f66 Copyright cleanup time,
bzr-revno: 2479
2015-01-19 08:34:29 +00:00
Tomas Groth 685b2fde32 Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175
Fixes: https://launchpad.net/bugs/1405172, https://launchpad.net/bugs/1405175
2015-01-18 20:38:03 +00:00
Raoul Snyman 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
Ken Roberts 4859e9866d Add .bin support for CCLI file import 2015-01-11 10:37:50 -08:00
Phill Ridout 9fef267fd3 Changed the year 2015-01-02 11:42:17 +00:00
Phill Ridout b9f09142ed HEAD 2015-01-02 11:40:51 +00:00
Tim Bentley f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
Phill Ridout 36417083ce head 2014-12-29 17:25:36 +00:00
Samuel Mehrbrodt c5d716f565 Test 2014-12-24 14:21:17 +01:00
Phill Ridout c9e1dcceff head 2014-12-23 18:57:04 +00:00
Tim Bentley 93d0314b7e General fixes 2014-12-22 17:34:43 +00:00
Phill Ridout cb0e4dc7ba added copyright header to test 2014-12-19 22:01:15 +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
93706f8d99 Fix for overwriting files on song export + test. Fixes bug 1216232.
Only show slide-dropdown on live-slidecontroller when it is populated. Fixes bug 1390238.
Make sure that the slidecontroller toolbar layout is correctly adjusted to fit its size. Fixes bug 1387304.
Mark a song edited from preview as coming from plugin. Fixes bug 1382672
Make the settingswindow higher to make room for the new settings. Fixes bug 1377283.

bzr-revno: 2447
2014-11-19 20:59:27 +00:00
Tomas Groth c85f49a16c Added test for openlyrics export of songs with same title and author 2014-11-16 22:44:44 +00:00
Tomas Groth 9b517cd569 Improved support for verseorder in WA import 2014-11-11 11:38:24 +01:00
Raoul Snyman e9ec5d202c [bug 1306950] Set the username, password and "save" checkbox back to enabled when the login fails
[refactor] Make the SongSelectForm slightly more testable
[test] Write some tests for the form itself
2014-11-09 02:41:30 +02:00
Tomas Groth 02a159bf65 Added one more test file for WoW import 2014-11-05 14:04:43 +01:00
Tomas Groth 77c7da2d20 Change duplicate check to pass int-string tuples to workers, to workaround windows issue, see bug #1388850
Fixes: https://launchpad.net/bugs/1388850
2014-11-05 09:42:33 +01:00
Tomas Groth 51f4539822 Added test for Word of Worship import 2014-11-03 15:36:27 +01:00
Raoul Snyman 3771cb42a8 HEAD 2014-10-22 22:47:47 +02:00
Raoul Snyman 551a10d311 Added and updated tests:
- Refactored FirstTimeForm to use an initalise() method, in order to be more testable
- Rewrote FTW tests to test initialise()
- Refactored TestMixin get_application() to setup_application() since it doesn't actually return an application object
- Refactored ListPreviewWidget to make it more testable
- Wrote tests for ListPreviewWidget
- Refactored FormattingTagsForm somewhat
- Updated FormattingTagsForm tests

Updated setup.py with some Python3 changes.
2014-10-22 22:43:05 +02:00
Samuel Mehrbrodt 674cf930ef Update jQuery and jQuery Mobile
bzr-revno: 2426
2014-10-21 22:07:19 +01:00
Samuel Mehrbrodt 637c0060f9 Add test 2014-10-13 13:38:13 +02:00
Tomas Groth 60dc075e3b pep8 fix 2014-09-25 21:46:09 +01:00
Tomas Groth 9b8b114a59 Fixed the new test. 2014-09-25 21:31:31 +01:00
Tomas Groth 3e66b4aa98 Fix for importing custom tags from openlyricsxml + test in progress 2014-09-25 17:01:11 +02:00
Tomas Groth 977fd1d187 Fix tests so they can run individually. 2014-09-25 16:59:56 +02:00
Samuel Mehrbrodt c1d82bdf54 Merge trunk 2014-08-24 13:34:14 +02:00
Tomas Groth 3a1fda85d5 Fixed windows test failure by removing special char from filenames 2014-08-21 14:51:34 +02:00
Samuel Mehrbrodt 0bf256070a Add test 2014-08-18 21:04:46 +02:00
Samuel Mehrbrodt 16399e2ea5 This prevents updates from running (which should only run on outdated databases that existed before)
bzr-revno: 2408
2014-08-04 06:02:58 +01:00
Samuel Mehrbrodt fa5787e5d8 Add test 2014-07-17 23:16:00 +02:00
Samuel Mehrbrodt d5a3651c95 Merge trunk 2014-07-14 18:48:48 +02:00
Samuel Mehrbrodt b2afbd688d Add an importer for PowerPraise
bzr-revno: 2404
2014-07-14 17:26:50 +01:00
Samuel Mehrbrodt 6c40962afb Allow editing of author types and fix bug in servicemanager
bzr-revno: 2403
2014-07-14 17:25:59 +01:00
Samuel Mehrbrodt 79c5d61d94 Negative test 2014-07-12 22:00:58 +02:00
Samuel Mehrbrodt 7f731146a3 Merge trunk 2014-07-09 14:47:29 +02:00
Samuel Mehrbrodt 79009a1a7f Add test 2014-07-09 14:41:55 +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 b7a141f75c Add Presentation Manager import
Fixes: https://launchpad.net/bugs/957017
2014-07-07 15:30:55 +02:00
Samuel Mehrbrodt 8e8288ddaa Add test 2014-07-05 22:04:17 +02:00
Samuel Mehrbrodt cfd9631d04 Parse verse names 2014-07-05 18:21:43 +02:00
Samuel Mehrbrodt 686f8d2437 More renaming 2014-07-04 11:31:06 +02:00
Samuel Mehrbrodt 87eb8804de Fixes 2014-07-04 00:06:18 +02:00
Samuel Mehrbrodt 9f34552364 PowerPraise importer
Fixes: https://launchpad.net/bugs/1336929
2014-07-03 23:30:41 +02:00
Samuel Mehrbrodt c9b47e8e6f PEP8 2014-07-03 19:57:46 +02:00
Samuel Mehrbrodt 3b7d5f53ba PEP8 2014-07-03 19:57:13 +02:00
Samuel Mehrbrodt d59be6ca82 Move song import plugins to subfolder 2014-07-03 18:54:51 +02:00
Samuel Mehrbrodt 66827a7676 Parse verse order 2014-06-26 09:58:59 +02:00
Samuel Mehrbrodt 93c3a57ea9 Add missing files 2014-06-25 17:04:28 +02:00
Samuel Mehrbrodt c3e9d0c5b3 Add test 2014-06-25 17:03:00 +02:00
Samuel Mehrbrodt d61111ab89 Add proper error messages to EasyWorship import.
Also make sure that Songs.db (lowercase ending) is also being recognized.

bzr-revno: 2394
Fixes: https://launchpad.net/bugs/1326664
2014-06-12 20:53:53 +02:00
Samuel Mehrbrodt 543f4f37dd Add test for ProPresenter Import 2014-06-09 12:27:17 +02:00
Samuel Mehrbrodt b2e4c6f99f Add test for missing songs.mb 2014-06-09 09:55:48 +02:00
Stewart Becker ed295d38dd Fixed a typo: load_Last_file -> load_last_file
Added tests for OpenSongImport and fixed some PEP8 issues.

bzr-revno: 2387
2014-06-04 05:54:44 +01:00
Samuel Mehrbrodt 9f5895dd82 Song duplicates added when using different author types for the same author
bzr-revno: 2386
2014-06-03 17:20:46 +01:00
Samuel Mehrbrodt 50c2c9bc0e Fix bug 1316979 by changing the 'authors' relation to readonly.
bzr-revno: 2384
2014-05-31 07:17:52 +01:00
Samuel Mehrbrodt dd9d535f81 Split test in two methods 2014-05-21 21:55:16 +02:00
Samuel Mehrbrodt d6afa49055 Test fixes 2014-05-13 19:52:08 +02:00
Samuel Mehrbrodt a75790d699 Indentation 2014-05-13 11:54:12 +02:00
Samuel Mehrbrodt 1804b690bd Merge trunk 2014-05-13 11:53:02 +02:00
Samuel Mehrbrodt 35e23456fe merge trunk 2014-05-13 11:50:36 +02:00
Samuel Mehrbrodt 97b603a2d6 Add test for author matching 2014-05-13 11:44:19 +02:00
Samuel Mehrbrodt b7b0176dec Cleanups 2014-05-13 11:12:07 +02:00
Samuel Mehrbrodt a1e2e92132 PEP8 2014-05-13 11:09:42 +02:00
Samuel Mehrbrodt 6eb2d4f49d Write test for adding and removing authors 2014-05-13 11:08:46 +02:00
Samuel Mehrbrodt 9dd9f21135 Add an option to display the songbook in the footer
bzr-revno: 2381
2014-05-10 07:43:18 +01:00
Samuel Mehrbrodt 8592551d81 Fix SongShowPlus Import when CCLI number contains text
bzr-revno: 2380
2014-05-09 17:10:07 +01:00
Tomas Groth 45344f900d Fix for crash when importing from a EasyWorship DB that contains unexpected dataformatting
bzr-revno: 2379
2014-05-09 16:51:55 +01:00
Samuel Mehrbrodt 9467b06e14 Merge trunk 2014-05-07 22:31:28 +02:00
Stefan Strasser fb2381f11a fixed bug #1312629 Error on entering invalid character in verse-order
bzr-revno: 2377
Fixes: https://launchpad.net/bugs/1312629
2014-05-07 22:29:53 +02:00
Samuel Mehrbrodt ee7a8b9804 Fixes 2014-05-07 12:25:36 +02:00
Tomas Groth c7ce62bd43 Changed to ignore wrongly formatted songs. 2014-05-05 19:29:57 +02:00
Samuel Mehrbrodt 922bbc3b57 Typo, remove annotations 2014-05-03 12:53:51 +02:00
Samuel Mehrbrodt a98ea19306 Add test for songbook display 2014-05-03 12:42:18 +02:00
Tomas Groth 689700dd01 fixes for tests 2014-05-02 23:48:59 +02:00
Tomas Groth 5d63820b17 Added support for importing EW songs even if RTF is not escaped as espected, also fixed importing og songs with unicode in metadata.
Fixes: https://launchpad.net/bugs/1299837
2014-05-02 23:07:56 +02:00
Samuel Mehrbrodt bdf3109aaa Fix SongShowPlus Import for certain cases
Fixes: https://launchpad.net/bugs/1310623
2014-05-01 10:46:45 +02:00
Stewart Becker a56f00ddc0 Merge from parent 2014-04-30 21:40:33 +01:00
Stewart Becker 4022cff5e5 Fix some issues I ran into when importing our OpenSong 'database' 2014-04-30 21:39:40 +01:00
Tomas Groth cc0f0e1eb0 Support for importing ews files (EasyWorship Service files)
bzr-revno: 2372
2014-04-29 17:54:14 +01:00
Tomas Groth 48fe8c5e37 Restructured the tests a bit. 2014-04-26 21:47:11 +02:00
Stefan Strasser c2d1589dcb fixed a pep-issue in songs-lib and corrected a comment in a test 2014-04-26 07:07:08 +02:00