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

17563 Commits

Author SHA1 Message Date
Raoul Snyman c6f077af33 Merge branch 'release-3.0.1' into 'master' 
Release version 3.0.1

See merge request openlp/openlp!548
 2023-01-13 17:41:15 +00:00
Raoul Snyman 60f08b8348 Release version 3.0.1 2023-01-12 21:00:53 -07:00
Raoul Snyman bfdf392654 Merge branch 'translations-12012023' into 'master' 
Translations 12012023 - and force windows and mac builds (i hope)

See merge request openlp/openlp!547
 2023-01-13 03:55:03 +00:00
Tim Bentley e7b0fd71fe Translations 12012023 - and force windows and mac builds (i hope) 2023-01-13 03:55:03 +00:00
Raoul Snyman 4f12a3232e Merge branch 'fix-some-tests' into 'master' 
Try to fix some tests that are failing in AppVeyor on macOS

See merge request openlp/openlp!546
 2023-01-12 14:15:13 +00:00
Raoul Snyman 137c04933f
Try to fix some tests that are failing in AppVeyor on macOS 2023-01-11 17:11:10 -07:00
Raoul Snyman 2b5fd98bac Merge branch 'test-sorting-num-prefix' into 'master' 
Add a naturel sorting test

See merge request openlp/openlp!545
 2023-01-11 21:26:50 +00:00
Tomas Groth 3a200957e8 Add a naturel sorting test 2023-01-11 21:26:50 +00:00
Raoul Snyman 30b9efd4f0 Merge branch 'Remote2' into 'master' 
Consolidate Remote APIs

See merge request openlp/openlp!537
 2023-01-11 03:07:58 +00:00
Raoul Snyman b6198c9889 Merge branch 'fix-presentation-theme-set' into 'master' 
Fixing theme loading of presentations

Closes #1279

See merge request openlp/openlp!544
 2023-01-11 03:07:34 +00:00
Mateus Meyer Jiacomelli 09009107e6 Fixing theme loading of presentations 2023-01-11 03:07:34 +00:00
Raoul Snyman 3498de7642 Merge branch 'vlc_cleanup2' into 'master' 
Vlc cleanup2

See merge request openlp/openlp!539
 2023-01-11 03:06:39 +00:00
Tim Bentley 0dc5fe2179 Vlc cleanup2 2023-01-11 03:06:38 +00:00
Raoul Snyman 873b49bcc6 Merge branch 'issue-1260' into 'master' 
Typecast presentation files from settings to Path

Closes #1260

See merge request openlp/openlp!542
 2023-01-11 03:06:18 +00:00
Raoul Snyman 0636f2554c Typecast presentation files from settings to Path 2023-01-11 03:06:17 +00:00
Tim Bentley 1e43e3e4a4 Merge branch 'issue-1263' into 'master' 
Fix issue #1263 by forcing the CSV file to be UTF-8 encoded

Closes #1263

See merge request openlp/openlp!543
 2023-01-10 08:16:23 +00:00
Tim Bentley 91700700f8 Merge branch 'reintroduce-icu' into 'master' 
First attempt at re-introducing the use of ICU, based on simply reverting the original patch

See merge request openlp/openlp!540
 2023-01-10 08:16:02 +00:00
Tomas Groth fbb6ecd2df First attempt at re-introducing the use of ICU, based on simply reverting the original patch 2023-01-10 08:16:02 +00:00
Tim Bentley 478a7d9c17 Merge branch 'fix-remote-version-test' into 'master' 
Fixing remote version test

See merge request openlp/openlp!541
 2023-01-10 08:04:55 +00:00
Raoul Snyman 8ec6b3e863 Fix issue #1263 by forcing the CSV file to be UTF-8 encoded 2023-01-09 19:29:22 -07:00
Mateus Meyer Jiacomelli 6fbeab8f49 Fixing remote version test 2023-01-09 17:56:11 -03:00
Tim Bentley 873f3c9113
Consolidate Remote APIs 2023-01-03 21:12:29 +00:00
Raoul Snyman dbea8bf56b Merge branch 'vlc_cleanup_1' into 'master' 
VLC Cleanup Part 1

See merge request openlp/openlp!531
 2023-01-01 03:49:32 +00:00
Tim Bentley 1020261fa4 VLC Cleanup Part 1 2023-01-01 03:49:31 +00:00
Raoul Snyman 0b96ca56df Merge branch 'New_Year_2023' into 'master' 
Happy new Year

See merge request openlp/openlp!534
 2023-01-01 03:48:19 +00:00
Raoul Snyman fbadec289b Merge branch 'print-service-line-break-fix' into 'master' 
Fixing Print Service missing newlines on print

Closes #1246

See merge request openlp/openlp!535
 2023-01-01 03:47:59 +00:00
Mateus Meyer Jiacomelli bb24b487f6 Fixing Print Service missing newlines on print 2023-01-01 03:47:58 +00:00
Tim Bentley 11d9c02579
Happy new Year 2022-12-31 15:54:46 +00:00
Raoul Snyman 7b99ed7da2 Merge branch 'build_fixes' into 'master' 
Remove optional package from build scripts

See merge request openlp/openlp!533
 2022-12-31 14:18:10 +00:00
Tim Bentley 503ecc492c Remove optional package from build scripts 2022-12-31 14:18:10 +00:00
Raoul Snyman 2e0fc791cb Merge branch 'fix-pre-commit' into 'master' 
Fixing flake8 URL for pre-commit

See merge request openlp/openlp!532
 2022-12-31 02:30:11 +00:00
Mateus Meyer Jiacomelli e4ddde105b Fixing flake8 URL for pre-commit 2022-12-31 02:30:11 +00:00
Tim Bentley c342509f75 Merge branch 'fix-startup-crash-non-portable' into 'master' 
Fix non-portable startup crash

See merge request openlp/openlp!530
 2022-12-29 08:01:47 +00:00
Daniel Martin 486f505a19 Fix non-portable startup crash 2022-12-29 08:01:47 +00:00
Tim Bentley 7d18386c89 Merge branch 'release-3.0' into 'master' 
Release version 3.0

See merge request openlp/openlp!529
 2022-12-28 21:33:55 +00:00
Raoul Snyman 30f8648ed1 Release version 3.0 2022-12-28 14:21:02 -07:00
Raoul Snyman c0e178c875 Merge branch 'background-media-display-hidden-fix' into 'master' 
Background media display fixes

See merge request openlp/openlp!527
 2022-12-28 21:17:44 +00:00
Mateus Meyer Jiacomelli 96c4062ae3 Background media display fixes 2022-12-28 21:17:44 +00:00
Raoul Snyman 13afff24fd Merge branch 'fix-duplicate-data-directory' into 'master' 
Fix duplicate data directory

Closes #1197

See merge request openlp/openlp!528
 2022-12-28 04:30:16 +00:00
Daniel Martin ca0ce759b4 Fix duplicate data directory 2022-12-28 04:30:16 +00:00
Raoul Snyman ebf8ea87de Merge branch 'translations-21122022' into 'master' 
Translations 21122022

See merge request openlp/openlp!526
 2022-12-21 17:00:34 +00:00
Tim Bentley 346a6b1d7d Translations 21122022 2022-12-21 17:00:33 +00:00
Tim Bentley 5766f0b1cb Merge branch 'presentation-live-fix' into 'master' 
Fix PDF items crashing when going live from service

See merge request openlp/openlp!525
 2022-12-21 16:49:46 +00:00
Mateus Meyer Jiacomelli 76d1dc8a9e Fix PDF items crashing when going live from service 2022-12-21 16:49:46 +00:00
Tim Bentley 4aa01953bc Merge branch 'issue-1239' into 'master' 
Fix OpenLyrics import error, and save dialog error

Closes #1239

See merge request openlp/openlp!522
 2022-12-19 07:40:46 +00:00
Raoul Snyman 799d9c3918 Fix OpenLyrics import error, and save dialog error 2022-12-19 07:40:45 +00:00
Tim Bentley 8feaa63561 Merge branch 'fix-openlyrics-chord-import' into 'master' 
OpenLyrics importer: Fix whitespaces being 'eaten' when importing a song with chord tags

See merge request openlp/openlp!520
 2022-12-18 07:50:31 +00:00
Mateus Meyer Jiacomelli f36830a272 OpenLyrics importer: Fix whitespaces being 'eaten' when importing a song with chord tags 2022-12-18 07:50:31 +00:00
Tim Bentley f3f7865161 Merge branch 'fix-api-crash-on-backgroud-audio' into 'master' 
Fix api crash on background audio attached

See merge request openlp/openlp!521
 2022-12-18 07:49:35 +00:00
Daniel Martin dc3015bd74 Fix api crash on background audio attached 2022-12-18 07:49:34 +00:00