Chris Witterholt
d57cfd816b
Merge branch 'deadlock-issue-in-api' into 'master'
...
Fix deadlock issue in Web API.
See merge request openlp/openlp!777
2024-11-03 10:25:48 +00:00
Chris Witterholt
4642c5c3f9
Fix deadlock issue in Web API.
2024-11-03 10:25:48 +00:00
Tim Bentley
81fb0e0610
Merge branch 'fix_edit_tests' into 'master'
...
Fix Edit Song Form tests
See merge request openlp/openlp!774
2024-09-19 16:04:19 +00:00
Tim Bentley
3d6e7f8b46
Fix Edit Song Form tests
2024-09-19 15:20:02 +01:00
Tim Bentley
e36dd84eb6
Merge branch 'pyside6' into 'master'
...
Obvious PySide6 fixes
See merge request openlp/openlp!773
2024-09-19 10:06:42 +00:00
Bastian Germann
ea9c66b0b8
Obvious PySide6 fixes
2024-09-19 10:06:42 +00:00
Tim Bentley
6f621c921c
Merge branch 'media_dev' into 'master'
...
Media Enhancements - fix up Media
See merge request openlp/openlp!772
2024-09-07 17:43:46 +00:00
Tim Bentley
22833b9b1d
Media Enhancements - fix up Media
2024-09-07 17:43:46 +00:00
Tim Bentley
661b0e09e2
Merge branch 'openlp-migrate-to-pyside6' into 'master'
...
Migrate from PyQt5 to PySide6
See merge request openlp/openlp!736
2024-08-26 20:57:54 +00:00
Tomas Groth
169212c812
Migrate from PyQt5 to PySide6
2024-08-26 20:57:54 +00:00
Tim Bentley
9646242881
Merge branch 'disable-macos-runners-for-now' into 'master'
...
Remove the jobs running on the macOS runners while they move across the country
See merge request openlp/openlp!771
2024-08-26 06:55:38 +00:00
d1dc7dc69f
Remove the jobs running on the macOS runners while they move across the country
2024-08-25 23:10:11 -07:00
Tomas Groth
c377c198a0
Merge branch 'translations-07082024' into 'master'
...
Translations 07082024
See merge request openlp/openlp!769
2024-08-07 21:20:19 +00:00
Tim Bentley
b838df8de8
Translations 07082024
2024-08-07 21:20:18 +00:00
Tomas Groth
f197f0d8d6
Merge branch 'issue-1915' into 'master'
...
Use a non blocking queued connection in method '_grab_screenshot_safe_signal' to prevent a deadlock in case of window capture when Web Remote Main view is active.
Closes #1915
See merge request openlp/openlp!767
2024-08-01 15:28:27 +00:00
Chris Witterholt
c44b65afb3
Use a non blocking queued connection in method '_grab_screenshot_safe_signal' to prevent a deadlock in case of window capture when Web Remote Main view is active.
2024-08-01 15:28:27 +00:00
Tomas Groth
4b00b1ef22
Merge branch 'fitz_old' into 'master'
...
Deal with PyMuPDF installed as fitz_old
See merge request openlp/openlp!754
2024-07-28 15:45:30 +00:00
Bastian Germann
9c0ea8444b
Deal with PyMuPDF installed as fitz_old
2024-07-28 15:45:30 +00:00
Tomas Groth
1fea33d83b
Merge branch 'songbeamer-import-fix' into 'master'
...
Fix that our songbeamer chord parsing was partly based on a malformed file leading to weird imports
See merge request openlp/openlp!766
2024-07-28 15:38:53 +00:00
Tomas Groth
75c565a384
Fix that our songbeamer chord parsing was partly based on a malformed file leading to weird imports
2024-07-28 15:38:53 +00:00
Chris Witterholt
6836412790
Merge branch 'return-system-language-when-language-auto-detect' into 'master'
...
Method "get_language" returns the two-letter ISO 639 language code instead of "en" in case the language in OpenLP is auto detected.
See merge request openlp/openlp!768
2024-07-23 20:09:38 +00:00
Chris Witterholt
e3a4d773f7
Method "get_language" returns the two-letter ISO 639 language code instead of "en" in case the language in OpenLP is auto detected.
2024-07-23 20:09:37 +00:00
Chris Witterholt
8af269bc05
Merge branch 'live_preview_shows_blank_screen' into 'master'
...
Live preview shows blank screen
See merge request openlp/openlp!764
2024-07-15 21:38:20 +00:00
Chris Witterholt
c92f7c16aa
Live preview shows blank screen
2024-07-15 21:38:19 +00:00
Chris Witterholt
2d9d79472b
Merge branch 'add-webapi-endpoint-delete-service-item' into 'master'
...
Add Web API endpoint to delete service items
See merge request openlp/openlp!765
2024-07-07 16:56:41 +00:00
Chris Witterholt
55eeb5176c
Add Web API endpoint to delete service items
2024-07-07 16:56:41 +00:00
Chris Witterholt
feb04ee841
Merge branch 'use-correct-transition-delay' into 'master'
...
Use correct transition delay
See merge request openlp/openlp!763
2024-07-02 18:21:04 +00:00
Chris Witterholt
1da03a8bf0
Use correct transition delay
2024-07-02 18:21:03 +00:00
Chris Witterholt
a6d66eb7c3
Merge branch 'use-correct-transition-delay-when-screen-is-hidden' into 'master'
...
Use correct transition delay when screen is hidden
See merge request openlp/openlp!762
2024-07-01 14:58:14 +00:00
Chris Witterholt
242a5028a7
Use correct transition delay when screen is hidden
2024-07-01 14:58:13 +00:00
Chris Witterholt
4d825cd445
Merge branch 'always-show-contents-in-live-preview-panel' into 'master'
...
Always show contents in live preview panel
See merge request openlp/openlp!761
2024-06-25 17:18:05 +00:00
Chris Witterholt
82623f8459
Always show contents in live preview panel
2024-06-25 17:18:05 +00:00
Tomas Groth
b399e14464
Merge branch 'fix-presentation-live-preview' into 'master'
...
Display presentation slides in live preview panel when main display is hidden.
See merge request openlp/openlp!760
2024-06-23 19:39:48 +00:00
Chris Witterholt
e4157402e3
Display presentation slides in live preview panel when main display is hidden.
2024-06-23 19:39:48 +00:00
Chris Witterholt
365a13fd83
Merge branch 'make-python-version-parsing-more-robust' into 'master'
...
Handle Python versions which include release levels
See merge request openlp/openlp!759
2024-06-21 16:31:59 +00:00
Pistos
bfbb20781c
Handle Python versions which include release levels
...
by ignoring the release level, and restricting the check to only the major,
minor, and micro components of the full version number.
2024-06-21 09:56:07 -05:00
Chris Witterholt
09646c4064
Merge branch 'issue-1368' into 'master'
...
Prevent crash by adding check for existence of linked audio file.
See merge request openlp/openlp!757
2024-06-20 21:55:54 +00:00
Chris Witterholt
b7e6406eab
Prevent crash by adding check for existence of linked audio file.
2024-06-20 21:55:54 +00:00
5da12ae623
Merge branch 'do-not-show-screen-change-message-twice' into 'master'
...
Do not show screen change message twice
See merge request openlp/openlp!755
2024-05-31 14:19:55 +00:00
Chris Witterholt
0ffe3aab4a
Do not show screen change message twice
2024-05-31 14:19:55 +00:00
Tomas Groth
538e1a101a
Merge branch 'issue-1584' into 'master'
...
Issue 1584
See merge request openlp/openlp!753
2024-05-24 20:01:31 +00:00
Chris Witterholt
52ce71b106
Issue 1584
2024-05-24 20:01:30 +00:00
bfbd85deb4
Merge branch 'release-3.1.2' into 'master'
...
Release 3.1.2
See merge request openlp/openlp!752
2024-05-17 20:05:52 +00:00
795aa22caa
Merge branch 'update-changelog-3.1.2' into 'master'
...
Update the changelog for 3.1.2
See merge request openlp/openlp!751
2024-05-17 20:04:45 +00:00
17240e2dd4
Update the changelog for 3.1.2
2024-05-17 20:04:45 +00:00
912695dca9
Release 3.1.2
2024-05-15 22:20:01 -07:00
ca5304d91e
Merge branch 'additional_planning_center_data' into 'master'
...
Additional planning center data
See merge request openlp/openlp!750
2024-05-14 16:03:45 +00:00
Tim Stephenson
2053029d7f
Additional planning center data
2024-05-14 16:03:45 +00:00
dd466fb013
Merge branch 'uppercase-global' into 'master'
...
Add "Apply UPPERCASE globally" function to songs plugin.
See merge request openlp/openlp!749
2024-05-02 16:46:44 +00:00
Matey Krastev
45f68364a3
Add "Apply UPPERCASE globally" function to songs plugin.
2024-05-02 16:46:44 +00:00