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

17791 Commits

Author SHA1 Message Date
Raoul Snyman d3bbf5e660
Merge branch 'use-online-help' into 'master' 
Don't build manual, use online manual instead

See merge request openlp/openlp!665
 2023-09-09 17:28:57 +00:00
Raoul Snyman ce3759e745 Don't build manual, use online manual instead 2023-09-09 09:58:20 -07:00
Raoul Snyman 21663a0ed8
Merge branch 'release-3.1rc1' into 'master' 
Update version number for 3.1.0rc1

See merge request openlp/openlp!663
 2023-09-08 14:07:31 +00:00
Raoul Snyman 8dc5c9fcd3
Update version number for 3.1.0rc1 2023-09-08 14:07:31 +00:00
Raoul Snyman d28b4685f6
Merge branch 'fix-macos-appveyor' into 'master' 
Update AppVeyor for Mac to install Pyro5 instead of Pyro4

See merge request openlp/openlp!662
 2023-09-08 14:06:24 +00:00
Raoul Snyman f06f458033 Update AppVeyor for Mac to install Pyro5 instead of Pyro4 2023-09-07 23:17:49 -07:00
Raoul Snyman ad2d9f1e3a
Merge branch 'fix-1627' into 'master' 
Silence error when shutting down threads

Closes #1627

See merge request openlp/openlp!661
 2023-09-07 16:55:52 +00:00
Raoul Snyman 1a57f85745
Silence error when shutting down threads 2023-09-07 16:55:52 +00:00
Raoul Snyman 7785ad60cd
Merge branch 'fix-song-editing' into 'master' 
Fix saving of songs

See merge request openlp/openlp!660
 2023-09-04 19:45:57 +00:00
Raoul Snyman 75d6a036e1 Fix saving of songs 2023-09-04 10:37:25 -07:00
Tim Bentley cded74c51f Merge branch 'update-vlc-messaging' into 'master' 
Update some system messaging

See merge request openlp/openlp!658
 2023-08-27 06:33:58 +00:00
Raoul Snyman 96a6f2ab64 Update some system messaging 2023-08-27 06:33:58 +00:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman dccf037bd6 Fix a couple of macOS issues 2023-08-19 09:43:20 +00:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman d0d0bb08f9 Fix issue #1624 2023-08-18 13:25:17 -07:00
Raoul Snyman 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
Raoul Snyman 9c9c7880b9 Make some forward compatibility changes 2023-08-18 19:28:04 +00:00
Raoul Snyman dee8fbb22a Refactor last instances of TestCase-based tests 2023-08-18 11:58:27 -07:00
Raoul Snyman 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
Raoul Snyman 586b54c7b8 Add test coverage for __main__.py and remove some unused files 2023-08-18 07:28:39 -07:00
Raoul Snyman 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
Raoul Snyman dc2476c27f Remove unused flag in Registry 2023-08-18 03:35:55 +00:00
Raoul Snyman 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
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