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

17893 Commits

Author SHA1 Message Date
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
Tim Bentley f2410aede7 Merge branch 'non-linux-test-fixes' into 'master' 
Fix tests for non-linux

See merge request openlp/openlp!717
 2024-02-15 21:48:23 +00:00
Tomas Groth 8c4f99689b Fix tests for non-linux 2024-02-15 21:48:22 +00:00
Raoul Snyman 52afc20ac4 Merge branch 'michaelweghorn/set_desktop_file_name' into 'master' 
Set the app's desktop file name

Closes #1837

See merge request openlp/openlp!714
 2024-02-15 18:29:51 +00:00
Michael Weghorn d32ee3dfa3 Set the app's desktop file name 2024-02-15 18:29:51 +00:00
Tim Bentley b3cab7113b Merge branch 'fix/asserts' into 'master' 
tests: add `assert_ ` prefix to a bunch of asserts missing it

See merge request openlp/openlp!711
 2024-02-15 15:11:57 +00:00
Joel Beckmeyer eef6ae8863 tests: add `assert_ ` prefix to a bunch of asserts missing it 2024-02-15 09:21:52 -05:00
Raoul Snyman ed7561bded Merge branch 'issue-1564' into 'master' 
Invalidate the service item cache when the theme changes

Closes #1564

See merge request openlp/openlp!715
 2024-02-15 03:58:41 +00:00
Raoul Snyman 4591c6bf06 Invalidate the service item cache when the theme changes 2024-02-14 20:54:29 -07:00
Raoul Snyman d73d387923 Merge branch 'platformdirs' into 'master' 
Replace appdirs with platformdirs

Closes #1792

See merge request openlp/openlp!712
 2024-02-15 03:49:04 +00:00
Bastian Germann c74bc27b48 Replace appdirs with platformdirs 2024-02-15 03:49:04 +00:00
Raoul Snyman 8c3d9b5742 Merge branch 'issue-1808' into 'master' 
Fix a PermissionError that occurs on Windows 10/11 when qtawesome tries to look at its own fonts

See merge request openlp/openlp!710
 2024-01-27 22:06:23 +00:00
Raoul Snyman d08f488040 Fix a PermissionError that occurs on Windows 10/11 when qtawesome tries to look at its own fonts 2024-01-26 23:30:24 -07:00
Raoul Snyman dc36d598e5 Merge branch 'issue-1641' into 'master' 
Change the filter to be SQLAlchemy 2 compatible

Closes #1641

See merge request openlp/openlp!709
 2024-01-27 04:03:28 +00:00
Raoul Snyman de068a5625 Change the filter to be SQLAlchemy 2 compatible 2024-01-26 08:12:45 -07:00
Raoul Snyman 3778448e76 Merge branch 'imports_2' into 'master' 
Working version of Community Imports

See merge request openlp/openlp!703
 2024-01-24 17:56:58 +00:00
Tim Bentley a4a05630e9 Working version of Community Imports 2024-01-24 17:56:58 +00:00
Tomas Groth 41ed3b45c1 Merge branch 'issue-1323-projectors' into 'master' 
Fix #1323 for the Projector Manager

Closes #1323

See merge request openlp/openlp!708
 2024-01-24 08:24:11 +00:00
Raoul Snyman 4cdcc3d320 Fix #1323 for the Projector Manager 2024-01-23 23:31:33 -07:00
Tomas Groth 143492f2e2 Merge branch 'typo-fix' into 'master' 
Typo in commnet - Update slidecontroller.py

See merge request openlp/openlp!706
 2024-01-13 15:57:47 +00:00
JessyJP 4269c33cd1 Typo in commnet - Update slidecontroller.py 2024-01-13 15:57:47 +00:00
Raoul Snyman b5fe3bde41 Merge branch 'wordproject-import-fix' into 'master' 
Made the wordproject import more robust

Closes #1437

See merge request openlp/openlp!705
 2024-01-09 17:26:36 +00:00
Tomas Groth d725627c16 Made the wordproject import more robust 2024-01-09 17:26:36 +00:00
Raoul Snyman 6fa5075b7b Merge branch 'Fix-a-typo-in-a-comment-that-reffers-to-a-method-rather-than-class' into 'master' 
Just a simple typo fix - Update loader.py

See merge request openlp/openlp!701
 2024-01-05 17:19:37 +00:00
JessyJP c17692976a Just a simple typo fix - Update loader.py 2024-01-05 17:19:37 +00:00
Raoul Snyman d13c1d199d Merge branch '2024' into 'master' 
2024 - One year older but wiser?

See merge request openlp/openlp!704
 2024-01-05 17:19:00 +00:00
Tim Bentley 6942211950 2024 - One year older but wiser? 2024-01-05 17:18:59 +00:00
Tim Bentley 504b6bfd0a Merge branch 'release-3.1.0rc4' into 'master' 
Release 3.1.0rc4

See merge request openlp/openlp!700
 2023-12-16 22:13:59 +00:00
Raoul Snyman cc0ee4bd5c Release 3.1.0rc4 2023-12-16 14:20:47 -07:00
Raoul Snyman eb389670f9 Merge branch 'ftw_loop_windows' into 'master' 
FTW loop on Windows

See merge request openlp/openlp!699
 2023-12-12 00:29:16 +00:00
Chris Witterholt 8cbfd8121e FTW loop on Windows 2023-12-12 00:29:16 +00:00
Raoul Snyman 24e8dfb6e9 Merge branch 'issue-1756' into 'master' 
Fix portable builds by re-arranging when the settings are created

Closes #1756

See merge request openlp/openlp!698
 2023-12-08 15:43:38 +00:00
Raoul Snyman 091caafcbf Fix portable builds by re-arranging when the settings are created 2023-12-07 20:47:39 -07:00