c6a9926e02
Fix the CI error after merging !414 and !417
2022-02-12 06:45:27 +00:00
Tim Bentley
4297124c02
Merge branch 'option-to-hide-custom-formatting-tag-content-in-main-window' into 'master'
...
Option to hide custom formatting tag content in main window
See merge request openlp/openlp!414
2022-02-11 19:13:51 +00:00
István Máté
bb507acf3f
Option to hide custom formatting tag content in main window
2022-02-11 19:13:50 +00:00
0d738e5233
Merge branch 'Caps_#509' into 'master'
...
Adds Uppercase Tag #509
See merge request openlp/openlp!417
2022-02-11 17:49:56 +00:00
Tim Bentley
72fb6347bb
Merge branch 'qr_code' into 'master'
...
Replace QR code with generator and update tests
See merge request openlp/openlp!416
2022-02-11 14:33:12 +00:00
Tim
329b19ef75
Opps temp file not needed
2022-02-10 17:24:34 +00:00
Tim
87b48b059d
Adds Uppercase Tag #509
2022-02-10 15:26:42 +00:00
Tim Bentley
65a9818134
Merge branch 'format-sup+nbsp-smaller-in-bibles' into 'master'
...
Smaller bible chapter and verse numbers
See merge request openlp/openlp!413
2022-02-10 12:10:13 +00:00
István Máté
6e8851ae56
Smaller bible chapter and verse numbers
2022-02-10 12:10:13 +00:00
Tim
d5c1c57584
Forgot the pillow
2022-02-10 11:57:25 +00:00
Tim
04e759dd7c
Update appveyor
2022-02-10 11:53:17 +00:00
Tim
c3f00bf288
Replace QR code with generator and update tests
2022-02-10 11:06:34 +00:00
Tomas Groth
d9eec25960
Merge branch 'process-pjlink-tests' into 'master'
...
Update tests for projectors.pjlinkcommands.process_pjlink()
See merge request openlp/openlp!410
2022-02-09 17:49:23 +00:00
d6c6ef59b6
Update tests for projectors.pjlinkcommands.process_pjlink()
2022-02-09 17:49:23 +00:00
Tomas Groth
296c3cb89d
Merge branch 'issue-238-handle-headers' into 'master'
...
Add a way to detect if there is a header in the CSV file
Closes #238
See merge request openlp/openlp!415
2022-02-09 17:48:37 +00:00
6fcd9c233b
Add a way to detect if there is a header in the CSV file
2022-02-08 11:54:34 -07:00
Tim Bentley
586007bb10
Merge branch 'two_fixes' into 'master'
...
Two fixes
See merge request openlp/openlp!411
2022-02-06 16:53:14 +00:00
Tomas Groth
5410a3409f
Merge branch 'more_year_end' into 'master'
...
Lets finish the year conversion
See merge request openlp/openlp!412
2022-02-06 16:35:24 +00:00
Tim
0ccb3620d5
Lets finish the year conversion
2022-02-06 09:10:17 +00:00
Tim
77199ca794
Allow switch back to the default theme for song editing. #917
2022-02-06 08:21:58 +00:00
Tim
b3788e404f
Add feedback for Custom Slide generation #73
2022-02-06 08:17:50 +00:00
Tim
dc168b2fdf
Add feedback for Custom Slide generation #73
2022-02-06 08:14:02 +00:00
Tim Bentley
db64a7d5bf
Merge branch 'test-commands-2' into 'master'
...
Update tests for pjlinkcommands 2022-02-03
See merge request openlp/openlp!408
2022-02-05 17:13:52 +00:00
d31c5979a2
Merge branch 'bug-0985' into 'master'
...
Issue #985 - TypeErr in PJLink.get_data() fix
Closes #985
See merge request openlp/openlp!398
2022-02-05 16:02:48 +00:00
2dfce1ad32
Issue #985 - TypeErr in PJLink.get_data() fix
2022-02-05 16:02:48 +00:00
Tim Bentley
87159e6e28
Merge branch 'issue-986-song-import' into 'master'
...
Fix bug #986 to better handle a both a correctly behaving lxml, as well as a badly behaving lxml
Closes #986
See merge request openlp/openlp!406
2022-02-05 10:31:38 +00:00
bdce45cb74
Merge branch 'sqlalchemy-warnings' into 'master'
...
Listen to SQLAlchemy's warnings
See merge request openlp/openlp!407
2022-02-04 22:06:24 +00:00
aa22652b3e
Merge branch 'issue-559-prevent-user-closing-display-window' into 'master'
...
Prevent the user from closing the display window
Closes #559
See merge request openlp/openlp!405
2022-02-04 22:06:06 +00:00
26d3659250
Prevent the user from closing the display window
2022-02-04 22:06:06 +00:00
b9eeac7043
Merge branch 'pin-pyobjc-for-macos' into 'master'
...
Pin the macOS pyobjc dependencies to pre-8.2 to get around a segfault in 8.2
See merge request openlp/openlp!404
2022-02-04 22:05:40 +00:00
Tim Bentley
ab57f523c5
Merge branch 'add-another-load-service-test' into 'master'
...
Expand tests a little further
See merge request openlp/openlp!403
2022-02-04 21:59:43 +00:00
be21ef15e6
Update tests for pjlinkcommands 2022-02-03
...
- (Ongoing) Update strings to f'' format
- New test module projector/messages/test_clss.py
- projectors/test_projector_commands_01/test_*_clss_* tests moved here
- Added start_poll test
- New test module projector/messages/test_misc.py
- Added test_srch
- openlp/core/projectors/plinkcommands.py
- Updated process_srch log entry in case of no projector instance
2022-02-04 13:33:25 -08:00
59f2cabae3
Listen to SQLAlchemy's warnings
2022-02-04 14:12:12 -07:00
c0e8cef731
Fix bug #986 to better handle a both a correctly behaving lxml, as well as a badly behaving lxml
2022-02-04 11:39:44 -07:00
f96d0fbce2
Pin the macOS pyobjc dependencies to pre-8.2 to get around a segfault in 8.2
2022-02-04 10:16:18 -07:00
ae0927d1f4
Expand tests a little further
2022-02-04 10:01:51 -07:00
bc872e0e87
Merge branch 'tidy_ups' into 'master'
...
Add some more tests
See merge request openlp/openlp!402
2022-02-04 16:38:00 +00:00
Tim
4400e0e132
Add some more tests
2022-02-04 15:40:12 +00:00
Tim Bentley
7a698daef1
Merge branch 'fix-passed-params' into 'master'
...
Fix loading service files from the command line
Closes #993 and #992
See merge request openlp/openlp!401
2022-02-04 15:30:43 +00:00
4f74be7d0a
Fix loading service files from the command line
2022-02-04 15:30:43 +00:00
Tim Bentley
bbb55dc3d1
Merge branch 'workaround-python3.10' into 'master'
...
Make two versions of a test to work around a difference in Python 3.10
See merge request openlp/openlp!399
2022-02-03 19:28:39 +00:00
54ad754268
Make two versions of a test to work around a difference in Python 3.10
2022-02-03 11:26:24 -07:00
Tim Bentley
2372872f4e
Merge branch 'issue-903-re-index-songs-crash' into 'master'
...
Handle invalid XML when parsing verses
Closes #903
See merge request openlp/openlp!393
2022-02-03 15:02:15 +00:00
0f74ef6f67
Handle invalid XML when parsing verses
2022-02-03 15:02:13 +00:00
Tim Bentley
235fd9244f
Merge branch 'issue-943-recent-files-bug' into 'master'
...
Fix issue #943 by typecasting to Path objects
Closes #943
See merge request openlp/openlp!395
2022-02-03 07:49:55 +00:00
efc32c9b1f
Fix issue #943 by typecasting to Path objects
2022-02-03 07:49:55 +00:00
Tim Bentley
de30cc3996
Merge branch 'issue-937-handle-unknown-verse-types' into 'master'
...
Fix issue #937 by handling custom verse types correctly
Closes #937
See merge request openlp/openlp!396
2022-02-03 07:49:14 +00:00
Tomas Groth
42cfb674e2
Merge branch 'fix-remote-search-bugs' into 'master'
...
Fix issues with searching from the web remote
See merge request openlp/openlp!397
2022-02-03 05:49:56 +00:00
bb8e508887
Fix issues with searching from the web remote
2022-02-03 05:49:56 +00:00
35723ed72c
Fix issue #937 by handling custom verse types correctly
2022-02-02 11:28:46 -07:00