Tim Bentley
e14307111b
Merge branch 'more-editverseform-tests' into 'master'
...
Add more tests around the EditVerseForm
See merge request openlp/openlp!488
2022-08-16 06:56:29 +00:00
Raoul Snyman
1deb7fa1c5
Add more tests around the EditVerseForm
2022-08-15 23:12:14 -07:00
Tim Bentley
ace1995952
Merge branch 'fix-issue-1151' into 'master'
...
Fix an attribute error in EditVerseForm
Closes #1151
See merge request openlp/openlp!487
2022-08-15 06:07:05 +00:00
Raoul Snyman
25a2bbdca1
Fix an attribute error in EditVerseForm
2022-08-15 06:07:05 +00:00
Raoul Snyman
b8eaa74e77
Merge branch 'release-2.9.5' into 'master'
...
Release version 2.9.5
See merge request openlp/openlp!486
2022-08-14 06:50:33 +00:00
Raoul Snyman
4e818cc195
Release version 2.9.5
2022-08-13 15:22:06 -07:00
Tim Bentley
0e35204880
Merge branch 'fix-issue-1147' into 'master'
...
Fall back on the file name if there is no hash
Closes #1147
See merge request openlp/openlp!485
2022-08-13 21:11:47 +00:00
Raoul Snyman
80f0d19393
Fall back on the file name if there is no hash
2022-08-13 13:52:39 -07:00
Tim Bentley
b298454d17
Merge branch 'fix-register-views-error' into 'master'
...
Fix up some of the tests on AppVeyor
See merge request openlp/openlp!483
2022-08-13 20:40:12 +00:00
Raoul Snyman
280fc1b31d
Fix up some of the tests on AppVeyor
2022-08-13 20:40:12 +00:00
Tim Bentley
d6a238af83
Merge branch 'fix-app-veyor-vlc' into 'master'
...
Fix the VLC installation command for the tests
See merge request openlp/openlp!482
2022-08-12 16:43:30 +00:00
Raoul Snyman
4dad84864a
Merge branch 'translations-12082022' into 'master'
...
Translations 12082022
See merge request openlp/openlp!480
2022-08-12 16:06:25 +00:00
Tim Bentley
ceaf9590ed
Translations 12082022
2022-08-12 16:06:25 +00:00
Raoul Snyman
c84b59b0b7
Fix the VLC installation command for the tests
2022-08-12 09:04:58 -07:00
Raoul Snyman
18261b4352
Merge branch 'Remove-zero' into 'master'
...
Remove ZeroConf as not used
See merge request openlp/openlp!481
2022-08-12 16:03:12 +00:00
Tim Bentley
13ab80b13d
Remove ZeroConf as not used
2022-08-12 16:03:11 +00:00
Tim Bentley
7b33e2e8e6
Merge branch 'force-pyqt5-in-pytest-qt' into 'master'
...
Force pytest-qt to use PyQt5
See merge request openlp/openlp!478
2022-08-12 06:47:11 +00:00
Tim Bentley
4ca282a35d
Merge branch 'fix-appveyor-tests' into 'master'
...
Install VLC before running tests
See merge request openlp/openlp!479
2022-08-12 06:46:46 +00:00
Raoul Snyman
8cb8119dfd
Install VLC before running tests
2022-08-11 22:44:34 -07:00
Raoul Snyman
0a1366af22
Force pytest-qt to use PyQt5
2022-08-11 22:26:40 -07:00
Tim Bentley
542be51f14
Merge branch 'fix-applocation-test' into 'master'
...
Fix some tests
See merge request openlp/openlp!471
2022-08-11 06:45:51 +00:00
Tim Bentley
a15fafb05e
Merge branch 'background-audio-starting-issues' into 'master'
...
Fix the song background audio not starting (or always starting)
See merge request openlp/openlp!477
2022-08-11 06:45:14 +00:00
Raoul Snyman
1fc297c8d3
Fix the song background audio not starting (or always starting)
2022-08-11 06:45:14 +00:00
Tim Bentley
85dec929b5
Merge branch 'fix-951-1142-no-remote-version' into 'master'
...
Correctly handle an issue where OpenLP is unable to download the remote version (fixes #1142 #951 )
Closes #951 and #1142
See merge request openlp/openlp!475
2022-08-11 06:43:46 +00:00
Tim Bentley
7e684640d6
Merge branch 'reset-css' into 'master'
...
Fix centering of text in the slides
See merge request openlp/openlp!474
2022-08-11 06:42:58 +00:00
Raoul Snyman
5331c2eb05
Fix some tests on Windows
...
- Remove the old conditional AppLocation tests
- Fix the AppLocation test
- Fix VLC test on Windows
- Handle UTF-8 BOM in EasySlides importer
2022-08-10 12:30:51 -07:00
Raoul Snyman
f2e8b6f60b
Correctly handle an issue where OpenLP is unable to download the remote version ( fixes #1142 #951 )
2022-08-10 11:57:43 -07:00
Raoul Snyman
4aa02145c0
Fix centering of text in the slides
2022-08-10 10:42:24 -07:00
Raoul Snyman
1c7ea6c9fa
Merge branch 'translations-07082022' into 'master'
...
Translations 07082022
See merge request openlp/openlp!473
2022-08-09 03:41:17 +00:00
Tim Bentley
72a68909a7
Translations 07082022
2022-08-09 03:41:17 +00:00
Tim Bentley
d38d3562b2
Merge branch 'issue-1005' into 'master'
...
Handle a case where an exception is thrown when OpenLP is shutting down (fixes #1005 )
Closes #1005
See merge request openlp/openlp!470
2022-07-22 20:54:10 +00:00
Raoul Snyman
d112c94482
Handle a case where an exception is thrown when OpenLP is shutting down ( fixes #1005 )
2022-07-22 13:38:43 -07:00
Tomas Groth
9cbe84bfff
Merge branch 'issue-1020' into 'master'
...
Fix "name 'NetworkStreamSelectorForm' is not defined"
Closes #1020
See merge request openlp/openlp!469
2022-07-22 20:30:55 +00:00
Raoul Snyman
99f9df1540
Fix "name 'NetworkStreamSelectorForm' is not defined"
2022-07-22 20:30:55 +00:00
Tomas Groth
82f8c05fa5
Merge branch 'bug-1098' into 'master'
...
Fix bug #1098 by checking that the selectedItem is not None
See merge request openlp/openlp!468
2022-07-22 20:28:39 +00:00
Raoul Snyman
2f9a16260f
Fix bug #1098 by checking that the selectedItem is not None
2022-07-21 16:12:31 -07:00
Raoul Snyman
229d40f638
Merge branch 'fix-invalid-folder-id' into 'master'
...
Try to work around issue with missing older ids (fixes #1108 )
Closes #1108
See merge request openlp/openlp!467
2022-07-21 21:10:30 +00:00
Raoul Snyman
e96e180476
Try to work around issue with missing older ids ( fixes #1108 )
2022-07-20 22:57:44 -07:00
Tim Bentley
f0dd979158
Merge branch 'more-permission-errors' into 'master'
...
Work around a permission error
See merge request openlp/openlp!466
2022-07-17 13:31:39 +00:00
Raoul Snyman
6a3f4a5686
Work around a permission error
2022-07-16 11:18:00 -07:00
Raoul Snyman
a467a3a91e
Merge branch 'fix-resolve' into 'master'
...
Fix the resolve issue on Windows
See merge request openlp/openlp!465
2022-06-28 19:26:11 +00:00
Raoul Snyman
0bd045d7fe
Fix the resolve issue on Windows; Refactor the skips in tests to use pytest's built in skip stuff
2022-06-28 11:17:30 -07:00
Tim Bentley
2290faf15a
Merge branch 'fix-1112' into 'master'
...
Skip recent menu items which are None
Closes #1112
See merge request openlp/openlp!464
2022-06-25 20:35:28 +00:00
Raoul Snyman
5aa34f5e9a
Skip recent menu items which are None
2022-06-25 20:35:28 +00:00
Raoul Snyman
04b4667499
Merge branch 'fix-pymediainfo-exception' into 'master'
...
Try to work around pymediainfo exception
Closes #1041
See merge request openlp/openlp!463
2022-06-21 18:51:57 +00:00
Raoul Snyman
3b38e5baa8
Try to work around pymediainfo exception
2022-06-21 18:51:57 +00:00
Tomas Groth
2464d83031
Merge branch 'alert_tests' into 'master'
...
Fix the Alerts tests failing and increase coverage
See merge request openlp/openlp!461
2022-05-28 07:48:53 +00:00
Tim Bentley
9a37f6cc86
Fix the Alerts tests failing and increase coverage
2022-05-28 08:34:37 +01:00
Raoul Snyman
5a07a0c438
Merge branch 'crosswalk-fix' into 'master'
...
Change crosswalk webbible parsing to match new layout.
See merge request openlp/openlp!460
2022-05-27 18:54:01 +00:00
Tomas Groth
cd8eefff9b
Change crosswalk webbible parsing to match new layout.
2022-05-27 18:54:01 +00:00