Commit Graph

1545 Commits

Author SHA1 Message Date
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
Tomas Groth e9e845035a pep8 fixes 2016-01-09 10:09:29 +01: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 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
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 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 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
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
Raoul Snyman ffbf75bb2f Release 2.3.1
bzr-revno: 2586
2015-12-28 22:19:43 +02:00
springermac@gmail.com b87156e104 "Make sure the main display on Mac OS X stays above the menu bar and dock but still allow the main window to be focused"
bzr-revno: 2585
2015-12-28 22:01:34 +02:00
springermac@gmail.com 160550f836 "Change some keyboard shortcuts to use predefined platform dependent shortcuts from Qt.
Display keyboard shortcuts with modifiers in their platform native form."

bzr-revno: 2584
2015-12-28 21:35:15 +02: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
Tomas Groth b69bb5ce27 trunk 2015-12-26 10:00:48 +01:00
Jonathan Springer 65b8b12590 Add tests 2015-12-24 14:27:44 -05: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
Jonathan Springer b858b0b103 merge trunk 2015-12-23 13:01:37 -05:00
springermac@gmail.com d9a02f6ada Migrate to PyQt5
bzr-revno: 2576
2015-12-21 21:27:10 +01:00