raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
17,173 Commits 5 Branches 0 Tags 296 MiB
aa22652b3e
Commit Graph

17173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raoul Snyman
aa22652b3e Merge branch 'issue-559-prevent-user-closing-display-window' into 'master' 
Prevent the user from closing the display window

Closes #559

See merge request openlp/openlp!405
 2022-02-04 22:06:06 +00:00
Raoul Snyman
26d3659250 Prevent the user from closing the display window 2022-02-04 22:06:06 +00:00
Raoul Snyman
b9eeac7043 Merge branch 'pin-pyobjc-for-macos' into 'master' 
Pin the macOS pyobjc dependencies to pre-8.2 to get around a segfault in 8.2

See merge request openlp/openlp!404
 2022-02-04 22:05:40 +00:00
Tim Bentley
ab57f523c5 Merge branch 'add-another-load-service-test' into 'master' 
Expand tests a little further

See merge request openlp/openlp!403
 2022-02-04 21:59:43 +00:00
Raoul Snyman
f96d0fbce2 Pin the macOS pyobjc dependencies to pre-8.2 to get around a segfault in 8.2 2022-02-04 10:16:18 -07:00
Raoul Snyman
ae0927d1f4 Expand tests a little further 2022-02-04 10:01:51 -07:00
Raoul Snyman
bc872e0e87 Merge branch 'tidy_ups' into 'master' 
Add some more tests

See merge request openlp/openlp!402
 2022-02-04 16:38:00 +00:00
Tim
4400e0e132
Add some more tests 2022-02-04 15:40:12 +00:00
Tim Bentley
7a698daef1 Merge branch 'fix-passed-params' into 'master' 
Fix loading service files from the command line

Closes #993 and #992

See merge request openlp/openlp!401
 2022-02-04 15:30:43 +00:00
Raoul Snyman
4f74be7d0a Fix loading service files from the command line 2022-02-04 15:30:43 +00:00
Tim Bentley
bbb55dc3d1 Merge branch 'workaround-python3.10' into 'master' 
Make two versions of a test to work around a difference in Python 3.10

See merge request openlp/openlp!399
 2022-02-03 19:28:39 +00:00
Raoul Snyman
54ad754268 Make two versions of a test to work around a difference in Python 3.10 2022-02-03 11:26:24 -07:00
Tim Bentley
2372872f4e Merge branch 'issue-903-re-index-songs-crash' into 'master' 
Handle invalid XML when parsing verses

Closes #903

See merge request openlp/openlp!393
 2022-02-03 15:02:15 +00:00
Raoul Snyman
0f74ef6f67 Handle invalid XML when parsing verses 2022-02-03 15:02:13 +00:00
Tim Bentley
235fd9244f Merge branch 'issue-943-recent-files-bug' into 'master' 
Fix issue #943 by typecasting to Path objects

Closes #943

See merge request openlp/openlp!395
 2022-02-03 07:49:55 +00:00
Raoul Snyman
efc32c9b1f Fix issue #943 by typecasting to Path objects 2022-02-03 07:49:55 +00:00
Tim Bentley
de30cc3996 Merge branch 'issue-937-handle-unknown-verse-types' into 'master' 
Fix issue #937 by handling custom verse types correctly

Closes #937

See merge request openlp/openlp!396
 2022-02-03 07:49:14 +00:00
Tomas Groth
42cfb674e2 Merge branch 'fix-remote-search-bugs' into 'master' 
Fix issues with searching from the web remote

See merge request openlp/openlp!397
 2022-02-03 05:49:56 +00:00
Raoul Snyman
bb8e508887 Fix issues with searching from the web remote 2022-02-03 05:49:56 +00:00
Raoul Snyman
35723ed72c Fix issue #937 by handling custom verse types correctly 2022-02-02 11:28:46 -07:00
Raoul Snyman
9b1fb4fe9f Merge branch 'issue-989-no-context-menu' into 'master' 
Move the common context menu code into the FolderLibraryItem class

Closes #989

See merge request openlp/openlp!394
 2022-02-02 14:58:46 +00:00
Raoul Snyman
b6074ed9ad Move the common context menu code into the FolderLibraryItem class 2022-02-01 16:02:17 -07:00
Tim Bentley
f711a64dc5 Merge branch 'Logging_Fixes' into 'master' 
Clean up logging

See merge request openlp/openlp!392
 2022-02-01 20:01:27 +00:00
Tim Bentley
04bbbba305 Merge branch 'pjlink_cmd' into 'master' 
Update pjlinkcommands tests

Closes #976 and #978

See merge request openlp/openlp!388
 2022-02-01 16:43:09 +00:00
Ken Roberts
e02b359b7e Update pjlinkcommands tests 2022-02-01 16:43:09 +00:00
Tim Bentley
79714f0b73 Merge branch '30rc1-fixes-part2' into 'master' 
Various bugfixes

Closes #916 and #944

See merge request openlp/openlp!387
 2022-02-01 11:11:52 +00:00
Tomas Groth
5e4721f4ce Various bugfixes 2022-02-01 11:11:52 +00:00
Tim Bentley
c9c8c62595 Merge branch 'Chinese-new-year' into 'master' 
Better late than never

See merge request openlp/openlp!391
 2022-02-01 11:11:36 +00:00
Tim
29db2f1fb7
Better late than never 2022-02-01 10:10:57 +00:00
Tim
5784dc4c24
Fix another division issue 2022-02-01 10:07:24 +00:00
Raoul Snyman
e30fb26a3c Merge branch 'pjm-tests' into 'master' 
Tests for ProjectorManager 2022-01-23

See merge request openlp/openlp!386
 2022-01-31 02:36:14 +00:00
Ken Roberts
2d0855f975 Tests for ProjectorManager 2022-01-23 2022-01-31 02:36:14 +00:00
Tomas Groth
d2f02a5ec3 Merge branch 'fix-macos-display-minimize' into 'master' 
Stop the display window from minimizing when the OpenLP window is not active on macOS

See merge request openlp/openlp!390
 2022-01-30 07:34:33 +00:00
Tomas Groth
e03613bafe Merge branch 'fix-macos-libreoffice-hang' into 'master' 
Fix hanging in macOS when LibreOffice is installed

See merge request openlp/openlp!389
 2022-01-30 07:33:43 +00:00
Raoul Snyman
fa802a5f3b
Stop the display window from minimizing when the OpenLP window is not active on macOS 2022-01-29 16:22:10 -07:00
Raoul Snyman
daa7539dd0
Fix hanging in macOS when LibreOffice is installed 2022-01-29 12:40:57 -07:00
Tim Bentley
ff0605cb21 Merge branch 'fix-915-songs-background-audio-auto-start' into 'master' 
Restore the auto-play for background audio in songs (fixes #915)

Closes #915

See merge request openlp/openlp!385
 2022-01-24 08:40:29 +00:00
Raoul Snyman
70fa22fdb4 Restore the auto-play for background audio in songs (fixes #915) 2022-01-22 13:21:31 -07:00
Raoul Snyman
91322f87d2 Merge branch '30rc1-fixes2' into 'master' 
Various bug fixes

Closes #978 and #976

See merge request openlp/openlp!384
 2022-01-21 21:32:09 +00:00
Tomas Groth
1d0b578370 Various bug fixes 2022-01-21 21:32:09 +00:00
Raoul Snyman
b3c27986c7 Merge branch 'proj_manager_tests' into 'master' 
ProjectorManager tests upd_add_port listener

See merge request openlp/openlp!383
 2022-01-21 21:30:52 +00:00
Ken Roberts
caa78be00d ProjectorManager tests upd_add_port listener 2022-01-21 21:30:51 +00:00
Tim Bentley
4f9ab2aa05 Merge branch '30rc1-fixes' into 'master' 
A few bug fixes

Closes #958

See merge request openlp/openlp!382
 2022-01-21 07:49:55 +00:00
Tomas Groth
bfce3db902 A few bug fixes 2022-01-21 07:49:55 +00:00
Tim Bentley
2143d89d1d Merge branch 'proj_manager_tests' into 'master' 
ProjectorManager tests

See merge request openlp/openlp!381
 2022-01-20 21:22:41 +00:00
Ken Roberts
c0713a56d4 ProjectorManager tests 2022-01-20 21:22:41 +00:00
Raoul Snyman
51623ebf95 Merge branch 'release-2.9.4' into 'master' 
Release 2.9.4

See merge request openlp/openlp!380
 2022-01-17 20:14:04 +00:00
Raoul Snyman
2e553a6833
Release 2.9.4 2022-01-17 13:02:54 -07:00
Tomas Groth
1334d50e74 Merge branch 'fix-unsaved-service-issues' into 'master' 
Fix a few service bugs

Closes #908 and #907

See merge request openlp/openlp!350
 2022-01-16 13:15:10 +00:00
Daniel Martin
fce6b47127 Fix a few service bugs 2022-01-16 13:15:09 +00:00