|
b4a502e0ce
|
Merge branch 'issue-1104' into 'master'
Handle verse ranges in BibleServer
Closes #1104
See merge request openlp/openlp!558
|
2023-01-27 20:44:07 +00:00 |
|
|
203feaeeef
|
Handle verse ranges in BibleServer
|
2023-01-27 07:19:05 -07:00 |
|
|
07be40fe3b
|
Merge branch 'issue-1287' into 'master'
Attempt to fix #1287 by checking for both str and bytes, and decoding bytes to unicode
Closes #1287
See merge request openlp/openlp!557
|
2023-01-26 21:55:59 +00:00 |
|
Tomas Groth
|
5042992460
|
Merge branch 'issue-1295' into 'master'
Fix up loading 2.9.x services
Closes #1295
See merge request openlp/openlp!556
|
2023-01-25 05:29:00 +00:00 |
|
|
f060664c9f
|
Fix up loading 2.9.x services
|
2023-01-25 05:29:00 +00:00 |
|
|
f4f39d8c0b
|
Attempt to fix #1287 by checking for both str and bytes, and decoding bytes to unicode
|
2023-01-24 16:55:50 -07:00 |
|
|
bc6c1e629a
|
Merge branch 'vlc_3a' into 'master'
Add debugging for VLC and fix strange state.
See merge request openlp/openlp!555
|
2023-01-21 05:29:31 +00:00 |
|
Tim Bentley
|
522e9041cd
|
Add debugging for VLC and fix strange state.
|
2023-01-21 05:29:31 +00:00 |
|
|
2d2e84b4ce
|
Merge branch 'waiting-dialog-includes-presentation-shutdown' into 'master'
Display the closing progress dialog during plugin shutdown
See merge request openlp/openlp!554
|
2023-01-19 17:45:08 +00:00 |
|
|
1ee8223d55
|
Display the closing progress dialog during plugin shutdown
|
2023-01-18 23:15:11 -07:00 |
|
|
c6bfc486f5
|
Merge branch 'fix-worshipcenterpro-bug' into 'master'
Fix an issue with the Worship Center Pro importer
See merge request openlp/openlp!553
|
2023-01-18 17:45:14 +00:00 |
|
|
d6c22432a1
|
Fix an issue with the Worship Center Pro importer
|
2023-01-17 19:46:04 -07:00 |
|
|
4443a8aaa2
|
Merge branch 'issue-1281' into 'master'
Fix an issue where the websockets server would try to shut down even when -w is supplied
Closes #1281
See merge request openlp/openlp!552
|
2023-01-17 23:16:48 +00:00 |
|
|
db3d5d2036
|
Merge branch 'issue-1278' into 'master'
Fix white preview display when previewing presentations
Closes #1278
See merge request openlp/openlp!551
|
2023-01-17 23:16:34 +00:00 |
|
|
6ac288deeb
|
Fix white preview display when previewing presentations
|
2023-01-17 23:16:34 +00:00 |
|
|
fad0b22f2e
|
Fix an issue where the websockets server would try to shut down even when -w is supplied
|
2023-01-16 22:53:59 -07:00 |
|
|
a7d46a3a01
|
Merge branch 'move-not-link-servicefile' into 'master'
Use a simpler approach when creating a tmp file when saving service files
See merge request openlp/openlp!550
|
2023-01-15 22:40:53 +00:00 |
|
Tomas Groth
|
3f68c156d0
|
Use a simpler approach when creating a tmp file when saving service files
|
2023-01-15 22:40:53 +00:00 |
|
|
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 |
|
|
60f08b8348
|
Release version 3.0.1
|
2023-01-12 21:00:53 -07:00 |
|
|
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 |
|
|
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 |
|
|
137c04933f
|
Try to fix some tests that are failing in AppVeyor on macOS
|
2023-01-11 17:11:10 -07:00 |
|
|
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 |
|
|
30b9efd4f0
|
Merge branch 'Remote2' into 'master'
Consolidate Remote APIs
See merge request openlp/openlp!537
|
2023-01-11 03:07:58 +00:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|