23c8d784a5
Merge branch 'translations-26082023' into 'master'
...
Translations 26082023
See merge request openlp/openlp!657
2023-08-26 20:00:20 +00:00
Tim Bentley
388e0822cd
Translations 26082023
2023-08-26 20:00:20 +00:00
ea6c3561f3
Merge branch 'fix_logging' into 'master'
...
Re introduce the selective turning off logging - correctly this time.
See merge request openlp/openlp!655
2023-08-26 15:24:53 +00:00
Tim Bentley
4a3923136d
Re introduce the selective turning off logging - correctly this time.
2023-08-26 15:24:52 +00:00
88f42b1075
Merge branch 'fix-macos-issues' into 'master'
...
Fix some issues with building on macOS
See merge request openlp/openlp!656
2023-08-26 15:21:36 +00:00
4e12c3d0b6
Fix some issues with building on macOS
2023-08-25 20:49:35 -07:00
Tim Bentley
6779be4433
Merge branch 'images-db-issues' into 'master'
...
Bypass image db updates if the db has already been upgraded
Closes #1533
See merge request openlp/openlp!654
2023-08-25 19:07:46 +00:00
Tim Bentley
8f41f3170d
Merge branch 'song-import-spelling' into 'master'
...
Fix spelling in songimport.py
See merge request openlp/openlp!653
2023-08-25 18:35:51 +00:00
Tomas Groth
05192fd189
Fix spelling in songimport.py
2023-08-25 18:35:51 +00:00
44deda4440
Bypass image db updates if the db has already been upgraded
2023-08-24 17:11:11 -07:00
Tomas Groth
a8d21de601
Merge branch 'fix-tests-on-macos' into 'master'
...
Fix a couple of macOS issues
See merge request openlp/openlp!652
2023-08-19 09:43:21 +00:00
dccf037bd6
Fix a couple of macOS issues
2023-08-19 09:43:20 +00:00
25c79528b0
Merge branch 'translations-18082023' into 'master'
...
Translations 18082023
See merge request openlp/openlp!651
2023-08-18 21:28:55 +00:00
Tim Bentley
9dfdbf8ca3
Translations 18082023
2023-08-18 21:28:55 +00:00
0d7f664626
Merge branch 'issue-1624' into 'master'
...
Fix issue #1624
Closes #1624
See merge request openlp/openlp!650
2023-08-18 21:01:55 +00:00
7b596bd969
Merge branch 'test-coverage-main' into 'master'
...
Add test coverage for __main__.py and remove some unused files
See merge request openlp/openlp!645
2023-08-18 20:26:59 +00:00
72e3394877
Merge branch 'update-last-tests' into 'master'
...
Refactor last instances of TestCase-based tests
See merge request openlp/openlp!649
2023-08-18 20:26:35 +00:00
d0d0bb08f9
Fix issue #1624
2023-08-18 13:25:17 -07:00
5be8bd0075
Merge branch 'fix-other-sqlalchemy-problems' into 'master'
...
Make some forward compatibility changes
See merge request openlp/openlp!648
2023-08-18 19:28:05 +00:00
9c9c7880b9
Make some forward compatibility changes
2023-08-18 19:28:04 +00:00
dee8fbb22a
Refactor last instances of TestCase-based tests
2023-08-18 11:58:27 -07:00
f82307ab6b
Merge branch 'songselect-import-on-download' into 'master'
...
Change SongSelect import procedure to import when clicking download on webpage
See merge request openlp/openlp!639
2023-08-18 18:03:32 +00:00
Tomas Groth
ad8dcb0f8a
Change SongSelect import procedure to import when clicking download on webpage
2023-08-18 18:03:32 +00:00
586b54c7b8
Add test coverage for __main__.py and remove some unused files
2023-08-18 07:28:39 -07:00
eaa97f433d
Merge branch 'remove-unused-flag' into 'master'
...
Remove unused flag in Registry
See merge request openlp/openlp!647
2023-08-18 03:35:55 +00:00
dc2476c27f
Remove unused flag in Registry
2023-08-18 03:35:55 +00:00
35e12309e5
Merge branch 'delete_presentation_from_controller_when_permission_error' into 'master'
...
When a permission error is raised during generation of the sha256 hash when deleting a presentation from the controller don't crash but continue.
See merge request openlp/openlp!646
2023-08-13 21:54:39 +00:00
Chris Witterholt
bbcea34498
When a permission error is raised during generation of the sha256 hash when deleting a presentation from the controller don't crash but continue.
2023-08-13 21:54:39 +00:00
8a31048381
Merge branch 'presentation-blank' into 'master'
...
Fix presentations not being able to return from Display Screen
See merge request openlp/openlp!632
2023-08-13 21:54:00 +00:00
Tomas Groth
35dc55d7f7
Fix presentations not being able to return from Display Screen
2023-08-13 21:54:00 +00:00
8d49dbf042
Merge branch 'issue-1382' into 'master'
...
Fix a websockets issue, and an OpenLP internal server issue
Closes #1618 and #1382
See merge request openlp/openlp!643
2023-08-13 21:49:06 +00:00
Tomas Groth
2fb1085a00
Merge branch 'fix-blocking-connections-on-macos' into 'master'
...
fix the deadlock on macos
See merge request openlp/openlp!644
2023-08-13 07:40:04 +00:00
4351651ad5
fix the deadlock on macos
2023-08-13 07:40:04 +00:00
62aadcf7b9
Fix issue #1618 by ignoring the messages if the event loop is not running
2023-08-12 15:44:19 -07:00
3593ae22b3
Fix issue #1382 by waiting for the service_manager to become available, or giving up after 2m
2023-08-12 13:53:30 -07:00
32dc18a31f
Merge branch 'display-api-abstraction' into 'master'
...
Display API abstraction
See merge request openlp/openlp!604
2023-08-12 15:59:37 +00:00
Mateus Meyer Jiacomelli
a04ed99dfc
Display API abstraction
2023-08-12 15:59:37 +00:00
f9c7320d98
Merge branch 'issue-1387' into 'master'
...
Try to fix an issue with MediaInfo perhaps returning a str instead of an int
Closes #1387
See merge request openlp/openlp!642
2023-08-12 15:59:00 +00:00
1eb8ef5f0d
Try to fix an issue with MediaInfo perhaps returning a str instead of an int
2023-08-11 23:31:02 -07:00
8052d29fa8
Merge branch 'async-remote-search' into 'master'
...
Fix issue #1582 by running the search in the original thread
Closes #1582
See merge request openlp/openlp!641
2023-08-11 22:28:25 +00:00
e4a6d647dc
Merge branch 'issue-1383' into 'master'
...
Try to fix an issue that only seems to happen on macOS
Closes #1383
See merge request openlp/openlp!640
2023-08-11 22:23:25 +00:00
f098b07f5e
Fix issue #1582 by running the search in the original thread
2023-08-11 12:47:21 -07:00
b3acb03051
Try to fix an issue that only seems to happen on macOS
2023-08-10 22:21:01 -07:00
Tomas Groth
49190fe6b3
Merge branch 'issue-1601' into 'master'
...
Allow loading the same presentation file multiple times from 2.4.x service file. Fixes bug #1601 .
See merge request openlp/openlp!638
2023-07-28 12:58:47 +00:00
Tomas Groth
27ae8006cc
Allow loading the same presentation file multiple times from 2.4.x service file. Fixes bug #1601 .
2023-07-28 13:33:34 +02:00
2e95b09f67
Merge branch 'cleanups' into 'master'
...
Minor cleanups
See merge request openlp/openlp!637
2023-07-24 14:23:04 +00:00
Tim Bentley
08ae435592
Minor cleanups
2023-07-24 14:23:04 +00:00
Tomas Groth
f02a099aaa
Merge branch 'fix-endless-loop-when-let-powerpoint-control-size-and-monitor-of-presentations-is-active' into 'master'
...
Fix endless loop at the end of a PowerPoint presentation
See merge request openlp/openlp!636
2023-07-23 21:24:13 +00:00
Chris Witterholt
0ebd544c6a
Fix endless loop at the end of a PowerPoint presentation
2023-07-23 21:24:13 +00:00
Tim Bentley
ceda811e70
Merge branch 'lock-data-dir' into 'master'
...
Implement a filelock for shared data folder.
See merge request openlp/openlp!519
2023-07-19 06:50:21 +00:00