Commit Graph

1654 Commits

Author SHA1 Message Date
Raoul Snyman dcd39adfe2 [songusage] No need to trigger the action twice 2016-02-11 23:05:41 +02:00
Raoul Snyman a172183a4e Release 2.3.3
bzr-revno: 2617
2016-02-06 23:12:06 +02:00
second@tgc.dk 8d083af742 More workarounds for bug 1531319.
If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test.
Use the chosen encoding when importing from easyworship db.

bzr-revno: 2616
Fixes: https://launchpad.net/bugs/1490508
2016-02-06 21:53:23 +01:00
Tomas Groth c75d0cee29 Added a test. 2016-02-06 21:33:27 +01:00
raoul@snyman.info 4a5f77f884 "Fixed a problem with the shortcuts.
Also tried to make the alternate clear button on the shortcuts dialog a little less weird.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1533246 (revision 2616)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1275/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1199/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1138/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functi..."

bzr-revno: 2614
Fixes: https://launchpad.net/bugs/1533246
2016-02-05 22:04:00 +02:00
Raoul Snyman 0802682a13 Fix up some comments 2016-02-05 21:01:21 +02:00
Raoul Snyman 0dd29893da More tests 2016-02-04 23:25:06 +02:00
Raoul Snyman 94edb189e8 Added some tests around the shortcut list form 2016-02-04 23:19:01 +02:00
Raoul Snyman 734bf4ffc4 Fix some BeautifulSoup warnings about parsers. 2016-02-04 22:17:40 +02: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 f61ac941d0 Mock FormattingTags in test, instead of loading all tags. 2016-01-23 10:53:34 +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
Tomas Groth 4bef5f72f2 trunk 2016-01-22 22:30:26 +01:00
Tomas Groth e593d77e14 Fix some broken tests that was not being used due to naming. 2016-01-22 22:26:25 +01:00
raoul@snyman.info f588b82976 Fix up the tests for Windows by retrying deleting the databases.
bzr-revno: 2608
2016-01-15 21:37:53 +01:00
Raoul Snyman 478d356d2e Oops, forgot a variable 2016-01-15 21:41:14 +02:00
Raoul Snyman 48eeb50d02 Add retries around other db removals 2016-01-15 21:14:24 +02:00
Raoul Snyman 1e8d787b93 Make pep8 happy 2016-01-15 20:37:03 +02:00
Raoul Snyman 5d21aab539 Make pep8 happy 2016-01-15 20:31:05 +02:00
Raoul Snyman e1ed3ab163 Use rmtree in the retry mechanism 2016-01-15 20:10:09 +02:00
Raoul Snyman b11b88f4eb Add a retry mechanism 2016-01-15 19:58:21 +02:00
Raoul Snyman d7b9e2cbe5 Try deleting the file itself after telling Python to do garbage collection 2016-01-15 19:50:57 +02:00
Raoul Snyman 402917024b Another go at this 2016-01-15 19:11:02 +02:00
Raoul Snyman 11b7bfd22d See if waiting a second helps 2016-01-14 22:31:37 +02:00
Raoul Snyman 9e8fe903a7 attempt to fix some tests in windows 2016-01-14 22:25:58 +02:00
Tomas Groth e91520fa60 pep8 fixes 2016-01-13 22:00:46 +01:00
Tomas Groth b1660c0525 Added test 2016-01-13 21:56:55 +01:00
Tim Bentley 31d6f931e5 head 2016-01-11 21:58:21 +00:00
Tim Bentley 3f0025a013 add tests 2016-01-11 21:57:45 +00:00
simon.hanna@serve-me.info 98258bc753 Reenable the stylesheet
remove the icons from mediamanager so that display in plasma works

bzr-revno: 2605
Fixes: https://launchpad.net/bugs/1404669
2016-01-11 21:57:20 +00: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 fc2efb7343 Fix Mac OS X display flags test 2016-01-10 22:27:28 -05:00
Jonathan Springer c07503f5dc Fix import 2016-01-10 17:10:50 -05:00
Jonathan Springer 263a7b2c62 Fix macosx_display_windows_flags_state test 2016-01-10 17:10:05 -05:00
Jonathan Springer a9df7771f6 Skip OpenOffice test if uno isn't available 2016-01-10 17:09:18 -05:00
Simon Hanna 09faa0cb87 Add a test 2016-01-10 21:06:41 +01:00
Simon Hanna 4d7ceba301 Merge with trunk 2016-01-10 17:01:43 +01:00
Raoul Snyman 0e8dc032da Release 2.3.2
bzr-revno: 2602
2016-01-10 15:15:22 +02: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
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
raoul@snyman.info d5856f02c6 [Song select] Stop search on viewing a song.
[Song select] Add a stop button to the SongSelect importer to stop searching.
[Song select] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown')

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/song-select-fixes (revision 2582)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1227/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1152/
[SUCC...

bzr-revno: 2598
2016-01-09 19:38:10 +00:00
Raoul Snyman 9904ba8da8 Remove media manager stylesheet for now 2016-01-09 21:10:56 +02:00
Raoul Snyman a4391bd6e3 HEAD 2016-01-09 20:01:49 +02:00
Ken Roberts bcbb523375 pep8 2016-01-09 09:46:20 -08:00
Ken Roberts f8d353efcb Rename test method 2016-01-09 09:43:38 -08: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 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 bf4225838e Fix failing test due to name conflict 2016-01-09 01:15:23 +01:00
Simon Hanna 21c6a3ff1c Merge with trunk 2016-01-09 01:07:15 +01:00
Simon Hanna 8ccfde6929 Merge trunk in 2016-01-09 01:03:54 +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 a44d70cb0f Fix some tests on windows. 2016-01-08 22:44:22 +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
s.mehrbrodt@gmail.com 859288f172 Usability improvements
* When pressing Ctrl+F, select the text in the searchfield to allow immediate typing
* Allow entering the verse order in lowercase (automatically convert to uppercase)

bzr-revno: 2592
Fixes: https://launchpad.net/bugs/1530340, https://launchpad.net/bugs/1530354
2016-01-08 17:28: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@serve-me.info a6ef19683d CodecForTr was dropped in Qt5
The deletion of songs still depended on that.

Just a minor edit to drop the dependency

bzr-revno: 2590
2016-01-08 17:24:48 +00:00
Tim Bentley fd3a85a68c head 2016-01-08 17:09:29 +00:00
Simon Hanna 2c5475e8fa Fix some pep issues in the changed files 2016-01-08 14:47:52 +01:00
Raoul Snyman c4bb673ac0 Remove potentially unnecessary code 2016-01-08 00:00:02 +02:00
Tomas Groth a61430a59f Fix the tests on Windows too 2016-01-07 23:57:01 +02:00
Raoul Snyman 7853706479 Apparently BibleServer.com has removed that Bible. Use another one instead. 2016-01-07 23:38:13 +02:00
Raoul Snyman 543d6898d3 Fix up the projector interface tests 2016-01-07 23:36:43 +02:00
Tomas Groth f2cccb90ae Fix projector tests 2016-01-07 23:07:55 +02: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 7ebbf65a86 Add a test 2016-01-07 13:36:11 +01:00
Raoul Snyman b1febaa452 Try to make sense of what the projector stuff is supposed to be doing. Found that internally the normal init_url was being called, which was wrong (i.e. it was being called twice, once from a plugin perspective, and then again from the projector perspective). Also, self.db_url was not being applied. 2016-01-06 22:02:39 +02:00
Raoul Snyman 51eefc84d9 Fix OS X test which wasn't being skipped on non-OS X platforms 2016-01-06 22:00:51 +02: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 75b885961e Add test for converting verse order to uppercase 2016-01-05 17:11:30 +01: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 7ed23514b4 Add test for about() function of MediaPlugin 2016-01-04 01:28:13 +01:00
Simon Hanna 8121f77e2d Add test for about() function of SongUsagePlugin 2016-01-04 01:27:56 +01:00
Simon Hanna 9459aff90c Add test for webkit_version function 2016-01-03 12:47:07 +01:00
Ken Roberts 2edb32ac7f pep8 fix 2016-01-03 00:32:43 -08:00
Ken Roberts f0a5e2eddb fix extraneous docstring notes in pjlink1 test 2016-01-03 00:18:58 -08: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
Simon Hanna c7563a5a64 Add documentation to tests 2016-01-03 00:37:22 +01:00
Tim Bentley 607371a6d7 Years move on
bzr-revno: 2588
2016-01-02 21:37:40 +00: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