Commit Graph

17346 Commits

Author SHA1 Message Date
Tim Bentley
52b5843d5d Merge branch 'use-old-style-text-outline' into 'master'
Switch to using the old way of making text outlines

Closes #1016

See merge request openlp/openlp!432
2022-03-01 07:49:44 +00:00
fe0f2e5a20 Switch to using the old way of making text outlines 2022-03-01 07:49:44 +00:00
290252ce51 Merge branch 'websocket-poll-by-events' into 'master'
Make Websocket Server and Poller to notify state change based on events

See merge request openlp/openlp!340
2022-03-01 06:06:39 +00:00
Mateus Meyer Jiacomelli
b4048e0d52 Make Websocket Server and Poller to notify state change based on events 2022-03-01 06:06:38 +00:00
Tomas Groth
f988c6bb9c Merge branch 'issue-886-confirm-delete-from-service' into 'master'
Confirm deleting item from service

Closes #886

See merge request openlp/openlp!427
2022-02-24 22:03:25 +00:00
Edward Birchall
66032f854a Confirm deleting item from service 2022-02-24 22:03:25 +00:00
Tim Bentley
6ee7c33805 Merge branch 'projector-manager-tests' into 'master'
refactor tests for projector manager 2022-02-21

See merge request openlp/openlp!420
2022-02-24 19:04:00 +00:00
5e1716d5cd refactor tests for projector manager 2022-02-21 2022-02-24 19:04:00 +00:00
Tim Bentley
0889f95cdf Merge branch 'tabui-tests' into 'master'
Tests for ProjectorTab 2022-02-23

See merge request openlp/openlp!428
2022-02-24 19:03:01 +00:00
cb46dd12c2 Tests for ProjectorTab 2022-02-23 2022-02-24 19:03:01 +00:00
Tim Bentley
8d6657c47e Merge branch 'pjlink-tests' into 'master'
Pjlink tests 2022-02-23

See merge request openlp/openlp!426
2022-02-24 19:02:28 +00:00
99d9398783 Pjlink tests 2022-02-23 2022-02-24 19:02:28 +00:00
9d598773ef Merge branch 'zeroconf-startup-crash' into 'master'
Zeroconf startup crash

See merge request openlp/openlp!423
2022-02-21 21:37:26 +00:00
Mateus Meyer Jiacomelli
eb8709a593 Zeroconf startup crash 2022-02-21 21:37:25 +00:00
Tim Bentley
b94bc0021e Merge branch 'AchimStuy-master-patch-36540' into 'master'
Keep unique_identifier of PDF service items.

See merge request openlp/openlp!419
2022-02-19 08:20:28 +00:00
Achim S
76afb204a0 Keep unique_identifier of PDF service items. 2022-02-19 08:20:28 +00:00
Tomas Groth
962f36967a Merge branch 'read-remote-version-from-file' into 'master'
Update the remote settings to use the remote's version.js file

See merge request openlp/openlp!421
2022-02-18 16:24:22 +00:00
6236a59891 Update the remote settings to use the remote's version.js file 2022-02-18 16:24:21 +00:00
Tim Bentley
330db2209c Merge branch 'advanced-chord-transpose-support' into 'master'
Advanced chord transpose support

See merge request openlp/openlp!341
2022-02-17 07:55:28 +00:00
STEPHANVS
a78afce38b
fix pipeline 2022-02-16 21:14:52 +01:00
STEPHANVS
fec445210a
added some tests 2022-02-16 21:07:39 +01:00
STEPHANVS
e3e6a5f59f
fix openlp.plugins.songs.lib.ui 2022-02-16 19:40:56 +01:00
STEPHANVS
35952e587c
centralize warning message 2022-02-16 19:37:18 +01:00
STEPHANVS
b0d34f3f19
fix test 2022-02-16 03:56:56 +01:00
STEPHANVS
7320f2ddc9
added option to turn off song key warning 2022-02-16 03:50:23 +01:00
STEPHANVS
bf9aba52da
fix exception in songs with no chords 2022-02-16 00:31:36 +01:00
STEPHANVS
237f82db5c
unifying warning message 2022-02-15 16:01:27 +01:00
STEPHANVS
3aa67ec2f2
pipeline fix 2022-02-14 15:07:19 +01:00
STEPHANVS
c80d8fbcfb
Consolidate song key check/warning message 2022-02-14 14:44:08 +01:00
Tomas Groth
024ac3d789 Merge branch 'fix-414-merge-issue' into 'master'
Fix the CI error after merging !414 and !417

See merge request openlp/openlp!418
2022-02-12 06:45:27 +00:00
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
STEPHANVS
f75e8dddb4
Remove unnecessary verse_text_edit update 2022-02-08 00:56:29 +01: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