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

17929 Commits

Author SHA1 Message Date
Raoul Snyman b360fa021a Merge branch 'fix-startup-sequence' into 'master' 
Fix OpenLP startup by reordering statements

See merge request openlp/openlp!687
 2023-11-29 17:16:43 +00:00
Raoul Snyman 1036c4e8ad Fix OpenLP startup by reordering statements 2023-11-29 10:00:07 -07:00
Raoul Snyman de5ba6eaac Merge branch 'openlp-hidpi-fixes' into 'master' 
High DPI Fixes

See merge request openlp/openlp!684
 2023-11-26 04:17:59 +00:00
Raoul Snyman cf558fbe9b High DPI Fixes 2023-11-26 04:17:58 +00:00
Raoul Snyman 8ddab1dc16 Merge branch 'issue-1700' into 'master' 
Fix #1700 by typecasting the calls to Paths

Closes #1700

See merge request openlp/openlp!682
 2023-11-23 03:05:37 +00:00
Raoul Snyman 79012cc005 Merge branch 'issue-1571' into 'master' 
Check before initialising a None Bible

Closes #1571

See merge request openlp/openlp!683
 2023-11-23 03:05:17 +00:00
Tomas Groth bff87b0e83 Merge branch 'pln-center-bible-import' into 'master' 
Fix traceback on bible import when no bible available

See merge request openlp/openlp!685
 2023-11-22 11:37:56 +00:00
Tomas Groth 0cd960494b Fix traceback on bible import when no bible available 2023-11-22 11:37:56 +00:00
Raoul Snyman 07633cd249 Check before initialising a None Bible 2023-11-21 10:42:15 -07:00
Raoul Snyman e1bd70284f Fix #1700 by typecasting the calls to Paths 2023-11-16 20:42:39 -07:00
Raoul Snyman a58a403d06 Merge branch 'pathedit-handles-none' into 'master' 
Make PathEdit handle None values

Closes #1704

See merge request openlp/openlp!681
 2023-11-16 20:53:36 +00:00
Raoul Snyman 60397daa63
Make PathEdit handle None values 2023-11-15 21:22:40 -07:00
Raoul Snyman 98d682c541 Merge branch 'fixExternalDb' into 'master' 
Fix external DB settings

See merge request openlp/openlp!679
 2023-11-14 21:45:48 +00:00
Simeon Brooks efec2bc70d Fix external DB settings 2023-11-14 21:45:48 +00:00
Tomas Groth d0aebd6429 Merge branch 'fix-alerts' into 'master' 
Fix alerts

Closes #1669

See merge request openlp/openlp!678
 2023-10-21 18:43:31 +00:00
Tomas Groth 45ccf8cf36 Fix alerts 2023-10-20 19:22:21 +02:00
Raoul Snyman 4a7273fd14 Merge branch 'wot-no-vlc' into 'master' 
Fixes #1325 - Handling of Missing VLC.

Closes #1325

See merge request openlp/openlp!676
 2023-10-19 23:15:39 +00:00
Tim Bentley 6b31c01ab9 Fixes #1325 - Handling of Missing VLC. 2023-10-19 23:15:38 +00:00
Raoul Snyman c277ac2b6f Merge branch 'sword-import-error-handling' into 'master' 
Better handling of attempts to load invalid SWORD folder or zip-file

Closes #1649 and #1326

See merge request openlp/openlp!675
 2023-10-12 03:32:14 +00:00
Tomas Groth 78708213a0 Better handling of attempts to load invalid SWORD folder or zip-file 2023-10-12 03:32:14 +00:00
Tomas Groth 5b2282ca23 Merge branch 'issue-1362' into 'master' 
Ensure a path set in PathEdit is a Path instance

Closes #1362

See merge request openlp/openlp!674
 2023-10-11 20:17:05 +00:00
Raoul Snyman 28905b4d60 Ensure a path set in PathEdit is a Path instance 2023-10-11 20:17:05 +00:00
Raoul Snyman 6d1c598f39 Merge branch 'openLyrics-whitespaces' into 'master' 
Fix trimming leading whitespaces

Closes #1534

See merge request openlp/openlp!659
 2023-10-10 23:53:41 +00:00
Gyuris Gellért e09d7719a9 Fix trimming leading whitespaces 2023-10-10 23:53:41 +00:00
Raoul Snyman 621a8f2516 Merge branch 'webengine-str-replace-all' into 'master' 
Inject String.replaceAll javascript implementation if needed into webengine when browsing SongSelect.

See merge request openlp/openlp!671
 2023-10-10 19:20:52 +00:00
Tomas Groth 58e3312ace Inject String.replaceAll javascript implementation if needed into webengine when browsing SongSelect. 2023-10-10 19:20:51 +00:00
Tomas Groth 987abbd033 Merge branch 'do-not-start-same-presentation-twice' into 'master' 
Do not start the same presentation again when it's already live.

See merge request openlp/openlp!673
 2023-10-02 19:25:15 +00:00
Chris Witterholt c99202342a Do not start the same presentation again when it's already live. 2023-10-02 19:25:15 +00:00
Raoul Snyman c0215785e4 Merge branch 'presentation-error-when-starting-from-blank-song' into 'master' 
Prevent key error when unblank screen at start of presentation.

See merge request openlp/openlp!672
 2023-10-01 16:08:45 +00:00
Chris Witterholt b4a67d7346
Prevent key error when unblank screen at start of presentation. 2023-09-30 14:44:58 +02:00
Raoul Snyman 86b798ec7c Merge branch 'release-3.1rc2' into 'master' 
OpenLP Release Candidate 2

See merge request openlp/openlp!670
 2023-09-14 17:01:10 +00:00
Raoul Snyman f4611e06cf OpenLP Release Candidate 2 2023-09-14 09:16:52 -07:00
Raoul Snyman 47bcdb6435 Merge branch 'make-images-multiselect-again' into 'master' 
Fix the multiselect in the images plugin

See merge request openlp/openlp!669
 2023-09-14 16:05:15 +00:00
Raoul Snyman f000948713 Merge branch 'revert-registry-get' into 'master' 
Revert the Registry behaviour

See merge request openlp/openlp!668
 2023-09-14 16:04:56 +00:00
Raoul Snyman a1581807c5 Revert the Registry behaviour 2023-09-14 16:04:56 +00:00
Raoul Snyman f24e5873bf Fix the multiselect in the images plugin 2023-09-13 21:31:37 -07:00
Raoul Snyman 69de0d7375
Merge branch 'spoof-songselect-webengine' into 'master' 
Spoof the songselect webengine user agent

See merge request openlp/openlp!667
 2023-09-10 22:58:40 +00:00
Tomas Groth 3fb3246a30
Spoof the songselect webengine user agent 2023-09-10 22:58:39 +00:00
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