Commit Graph

17925 Commits

Author SHA1 Message Date
Raoul Snyman 2ad33529e4 Merge branch 'issue-1877' into 'master'
Attempt to bubble up permissions errors to the user so that we don't run into None files or hashes

See merge request openlp/openlp!746
2024-04-20 22:26:55 +00:00
Raoul Snyman 7bb7dc35c0 Merge branch 'minor_fixes2' into 'master'
Stop Service File items from containing more than one audio file

See merge request openlp/openlp!742
2024-04-20 22:14:30 +00:00
Tim Bentley 9b9d8feafa Stop Service File items from containing more than one audio file 2024-04-20 22:14:29 +00:00
Raoul Snyman 32d132c2f0 Merge branch 'issue-1883' into 'master'
Fix build part of version number

Closes #1883

See merge request openlp/openlp!745
2024-04-20 22:13:26 +00:00
Raoul Snyman f5e0682e0d Fix build part of version number 2024-04-20 22:13:26 +00:00
Raoul Snyman 7d44795cf7 Merge branch 'issue-1878' into 'master'
Attempt to fix #1878 by checking if the service item exists first

Closes #1878

See merge request openlp/openlp!744
2024-04-20 22:13:08 +00:00
Raoul Snyman 64f1a0e52d Attempt to bubble up permissions errors to the user so that we don't run into None files or hashes 2024-04-19 23:11:01 -07:00
Raoul Snyman d2a2b94273 Merge branch 'hide-live-when-screen-setup-has-changed' into 'master'
Hide live when screen setup has changed

See merge request openlp/openlp!743
2024-04-20 05:42:23 +00:00
Chris Witterholt e93ac46f2a Hide live when screen setup has changed 2024-04-20 05:42:23 +00:00
Raoul Snyman 2639c7cd00 Attempt to fix #1878 by checking if the service item exists first 2024-04-19 21:59:07 -07:00
Tomas Groth 6d636f3235 Merge branch 'plugin-hooks' into 'master'
Add some registry functions and more that makes it easier for plugins to integrate

See merge request openlp/openlp!741
2024-04-17 20:06:18 +00:00
Tomas Groth b8855eb8ed Add some registry functions and more that makes it easier for plugins to integrate 2024-04-17 17:14:58 +02:00
Tim Bentley d1724bc6c3 Merge branch 'issue-1880' into 'master'
Make the slide height affect the size of the thumbnails generated

Closes #1880

See merge request openlp/openlp!738
2024-04-16 20:58:55 +00:00
Tim Bentley 62d6b61518 Merge branch 'fix-for-not-found-i18n-directory' into 'master'
Fix for not found i18n directory

See merge request openlp/openlp!739
2024-04-16 18:19:45 +00:00
Chris Witterholt 9b794e4ff8 Fix for not found i18n directory 2024-04-16 18:19:45 +00:00
Tim Bentley 6cfa2419e3 Merge branch 'fix-missing-verse-translations' into 'master'
Fix missing verse translations

See merge request openlp/openlp!740
2024-04-16 18:16:24 +00:00
Chris Witterholt 027391d321 Fix missing verse translations 2024-04-16 18:16:24 +00:00
Raoul Snyman 885e57ba41 Make the slide height affect the size of the thumbnails generated 2024-04-14 22:36:19 -07:00
Tomas Groth 6498b66698 Merge branch 'import-ewsx' into 'master'
Add ewsx song importer

See merge request openlp/openlp!737
2024-04-09 15:19:58 +00:00
Tomas Groth fa05ee4b2d Add ewsx song importer 2024-04-09 15:19:58 +00:00
Raoul Snyman 39833c770d Merge branch 'add-webapi-endpoint-get-translation' into 'master'
Add web API endpoint get configured language

See merge request openlp/openlp!730
2024-03-28 03:17:33 +00:00
Chris Witterholt fd45bba951 Add web API endpoint get configured language 2024-03-28 03:17:33 +00:00
Raoul Snyman f2484d170a Merge branch 'add-webapi-endpoint-get-shortcuts' into 'master'
Add web API endpoint get configured shortcut keys.

See merge request openlp/openlp!734
2024-03-27 19:12:22 +00:00
Chris Witterholt 34cc2a3e28 Add web API endpoint get configured shortcut keys. 2024-03-27 19:12:22 +00:00
Tim Bentley b569a1793d Merge branch 'bug-940' into 'master'
Add checks to prevent multiple Linked Audio items on songs

Closes #940

See merge request openlp/openlp!728
2024-03-25 07:51:34 +00:00
Trildar f3c675901c Add checks to prevent multiple Linked Audio items on songs 2024-03-25 07:51:34 +00:00
Raoul Snyman 34ff2dab8b Merge branch 'fix-1871' into 'master'
Further fix #1871 by adding the Application name as early as possible

Closes #1871

See merge request openlp/openlp!733
2024-03-24 19:59:36 +00:00
Raoul Snyman 78c32e434c Further fix #1871 by adding the Application name as early as possible 2024-03-24 10:43:29 -07:00
Tomas Groth 1a281e3931 Merge branch 'issue-1871' into 'master'
Fix unintentional change of the organization name by the domain name.

Closes #1871

See merge request openlp/openlp!732
2024-03-23 20:50:01 +00:00
Chris Witterholt 490b25b73b Fix unintentional change of the organization name by the domain name. 2024-03-23 20:50:00 +00:00
Raoul Snyman cb1db9f432 Merge branch 'fix-missing-translations' into 'master'
Fix missing translations

See merge request openlp/openlp!729
2024-03-18 06:13:26 +00:00
Chris Witterholt 6ea889b974 Fix missing translations 2024-03-18 06:13:26 +00:00
Raoul Snyman a53e20864c Merge branch 'release-3.1.1' into 'master'
Release 3.1.1

See merge request openlp/openlp!727
2024-03-10 00:57:32 +00:00
Raoul Snyman e5f6850d14 Release 3.1.1 2024-03-08 21:09:01 -07:00
Tomas Groth 87deeb58cc Merge branch 'issue-1860' into 'master'
Fix path to QtWebEngineProcess binary

Closes #1860

See merge request openlp/openlp!726
2024-03-07 05:41:43 +00:00
Raoul Snyman 2f54765670 Fix path to QtWebEngineProcess binary 2024-03-06 22:05:34 -07:00
Raoul Snyman 3c20d5f8d6 Merge branch 'songselect-import-encoding' into 'master'
Always open downloaded songs as utf-8

See merge request openlp/openlp!725
2024-03-07 03:56:37 +00:00
Raoul Snyman a40d5e894e Merge branch 'issue-1859' into 'master'
Use Python's version comparison, not Qt's

Closes #1859

See merge request openlp/openlp!724
2024-03-06 15:58:22 +00:00
Raoul Snyman 5508bb683c Use Python's version comparison, not Qt's 2024-03-06 15:58:22 +00:00
Tomas Groth cb490b9e59 Always open downloaded songs as utf-8 2024-03-06 13:08:02 +00:00
Tim Bentley 0d3acc2e67 Merge branch 'translations-01032024aa' into 'master'
Translations 01032024aa

See merge request openlp/openlp!723
2024-03-01 11:34:07 +00:00
Tim Bentley 9747f16de9 Translations 01032024aa 2024-03-01 11:34:07 +00:00
Raoul Snyman e5e8bc4164 Merge branch 'bugs31-email' into 'master'
Change bug reporting email address to differentiate between affected versions.

See merge request openlp/openlp!720
2024-02-19 06:16:21 +00:00
Tomas Groth 8c61bb68fd Change bug reporting email address to differentiate between affected versions. 2024-02-18 09:51:06 +01:00
Raoul Snyman 50c431a1f1 Merge branch 'version' into 'master'
Update version file - incase Superfly forgets!

See merge request openlp/openlp!719
2024-02-16 15:21:40 +00:00
Tim Bentley c5da029024 Update version file - incase Superfly forgets! 2024-02-16 15:21:39 +00:00
Tim Bentley 0065049437 Merge branch 'translations-14022024' into 'master'
Translations 14022024

See merge request openlp/openlp!716
2024-02-16 14:09:08 +00:00
Tim Bentley f0e23b4166 Translations 14022024 2024-02-16 14:09:07 +00:00
Tim Bentley 77627f55f0 Merge branch 'more-non-linux-test-fixes' into 'master'
Fix more non-linux test

See merge request openlp/openlp!718
2024-02-16 13:39:01 +00:00
Tomas Groth 2962b8dc14 Fix more non-linux test 2024-02-16 13:39:01 +00:00