openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity
17,901 Commits 6 Branches 56 Tags 310 MiB
Commit Graph

17901 Commits

Author SHA1 Message Date
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 4351651ad5 fix the deadlock on macos 2023-08-13 07:40:04 +00:00
Raoul Snyman 62aadcf7b9 Fix issue #1618 by ignoring the messages if the event loop is not running 2023-08-12 15:44:19 -07:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 1eb8ef5f0d Try to fix an issue with MediaInfo perhaps returning a str instead of an int 2023-08-11 23:31:02 -07:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman f098b07f5e Fix issue #1582 by running the search in the original thread 2023-08-11 12:47:21 -07:00
Raoul Snyman 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
Raoul Snyman 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
Tomas Groth 73b3568b5b Implement a filelock for shared data folder. 2023-07-19 06:50:21 +00:00
Raoul Snyman d97bc6a9ca Merge branch 'add-songs-to-topics-books-authors' into 'master' 
Add the list of associated songs to the delete dialog in the song maintenance form

See merge request openlp/openlp!635
 2023-07-18 20:13:12 +00:00
Raoul Snyman 11d55e498c Merge branch 'presentation-from-cloud-drive' into 'master' 
Add detection for presentation files that were uploaded from the cloud.

See merge request openlp/openlp!634
 2023-07-18 20:11:52 +00:00
Chris Witterholt f7f701abf2 Add detection for presentation files that were uploaded from the cloud. 2023-07-18 20:11:52 +00:00
Raoul Snyman 5e036ac608 Merge branch 'move-live-preview-one-line' into 'master' 
Move "Live" / "Preview" and current item on one line

See merge request openlp/openlp!633
 2023-07-18 20:11:10 +00:00
Julian f20ecee0e9 Move "Live" / "Preview" and current item on one line 2023-07-18 20:11:10 +00:00
Raoul Snyman 1affcebb78 Merge branch 'add-copyright-to-powerpraise-importer' into 'master' 
feat(importer): add authors to powerpraise importer

See merge request openlp/openlp!631
 2023-07-18 19:25:47 +00:00
Michael Heiniger f0438d6365 feat(importer): add authors to powerpraise importer 2023-07-18 19:25:47 +00:00
Raoul Snyman 92db0c0cc7 Add the list of associated songs to the delete dialog in the song maintenance form 2023-07-17 15:11:03 -07:00
Tim Bentley de2dde2064 Merge branch 'fix-db-finalize' into 'master' 
Create a connection and then run execute

See merge request openlp/openlp!630
 2023-07-14 15:53:47 +00:00
Raoul Snyman 58076ace93 Create a connection and then run execute 2023-07-14 08:23:16 -07:00
Raoul Snyman 14d3eff0bb Merge branch 'python311-appveyor' into 'master' 
Update appveyor.yml to use python 3.11.

Closes #1563

See merge request openlp/openlp!628
 2023-07-14 15:22:35 +00:00
Tomas Groth f3bbb0527c Update appveyor.yml to use python 3.11. 2023-07-14 15:22:35 +00:00
Tomas Groth 8572f6b321 Merge branch 'fix-with-only-columns' into 'master' 
Fix an issue with the arguments of with_only_columns

See merge request openlp/openlp!629
 2023-07-13 20:34:04 +00:00
Raoul Snyman 4afd01f70e Fix an issue with the arguments of with_only_columns 2023-07-13 12:34:46 -07:00
Tomas Groth 41887bbafb Merge branch 'michaelweghorn/fix_author_search' into 'master' 
Fix song search by author

Closes #1588

See merge request openlp/openlp!627
 2023-07-13 16:43:48 +00:00
Michael Weghorn a442242d9f Fix song search by author 2023-07-13 16:43:48 +00:00
Raoul Snyman 4330610756 Merge branch 'remove-pil' into 'master' 
Remove dependency on PIL since the latest version does not support PyQt5

See merge request openlp/openlp!626
 2023-07-13 14:09:11 +00:00
Tomas Groth b0bf26e530 Remove dependency on PIL since the latest version does not support PyQt5 2023-07-13 14:09:11 +00:00
Tomas Groth 3d21a6acf5 Merge branch 'slidecontroller-screenshot-test-fix' into 'master' 
Fixing freezing screenshot test

See merge request openlp/openlp!625
 2023-06-13 04:30:12 +00:00
Mateus Meyer Jiacomelli 449f1a8a77 Fixing freezing screenshot test 2023-06-09 20:19:05 -03:00
Raoul Snyman 97a3efbc47 Merge branch 'datasoul-transation-fix' into 'master' 
Fix Datasoul translate strings

See merge request openlp/openlp!624
 2023-06-07 18:20:20 +00:00
Mateus Meyer Jiacomelli 72e649dd0d Fix Datasoul translate strings 2023-06-07 13:05:57 -03:00
Tomas Groth 4f7a2338e6 Merge branch 'wayland-display-window-screenshot' into 'master' 
RFC/Proposal: Fallback code for display screenshot code (used on '/main'  Web Remote)

Closes #1284 and #1405

See merge request openlp/openlp!582
 2023-06-06 20:05:55 +00:00
Mateus Meyer Jiacomelli 003ebaafaa RFC/Proposal: Fallback code for display screenshot code (used on '/main' Web Remote) 2023-06-06 20:05:55 +00:00
Tim Bentley 545ec3d614 Merge branch 'translations-06062023' into 'master' 
Translations 06062023

See merge request openlp/openlp!623
 2023-06-06 16:17:14 +00:00
Tim Bentley 67fa74a897 Translations 06062023 2023-06-06 16:17:14 +00:00
Tim Bentley 72ac7dfd5e Merge branch 'new-theme-controls' into 'master' 
New theme adjustments: Adding letter spacing to theme main area; adding line and letter spacing to footer

See merge request openlp/openlp!611
 2023-06-06 15:47:41 +00:00