1
0
mirror of https://gitlab.com/openlp/openlp.git synced 2024-09-29 11:27:36 +00:00
Commit Graph

17527 Commits

Author SHA1 Message Date
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
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
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
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
Tim Bentley
8a0e6777c4 Merge branch 'issue-1229' into 'master'
Fix an issue where the incorrect path was used for language files

Closes #1229

See merge request openlp/openlp!515
2022-12-18 07:46:57 +00:00
3f93c1e6b5 Fix an issue where the incorrect path was used for language files 2022-12-18 07:46:56 +00:00
Tim Bentley
bd811c2b7a Merge branch 'fix-service-item-context-menu-hot-theme-reload' into 'master'
Fixing Themes hot reload when using ServiceItem context menu (Song theme level)

See merge request openlp/openlp!518
2022-12-12 08:04:29 +00:00
Mateus Meyer Jiacomelli
18e3969746 Fixing Themes hot reload when using ServiceItem context menu (Song theme level) 2022-12-12 08:04:28 +00:00
Tim Bentley
6b7ed17c98 Merge branch 'remote-version-fix' into 'master'
Fixing Web Remote's version.js file handling

See merge request openlp/openlp!517
2022-12-12 08:04:09 +00:00
Mateus Meyer Jiacomelli
2d7d4aa8a6 Fixing Web Remote's version.js file handling 2022-12-12 08:04:09 +00:00
Tim Bentley
78d42e27f5 Merge branch 'transpose-api-crash-fix' into 'master'
Fixing OpenLP crash (and increasing performance) caused when using Transpose API Endpoint

See merge request openlp/openlp!516
2022-12-12 08:03:39 +00:00
Mateus Meyer Jiacomelli
b1aef9d0fd Fixing OpenLP crash (and increasing performance) caused when using Transpose API Endpoint 2022-12-12 08:03:39 +00:00
70c9377e5a Merge branch 'translations-30112022' into 'master'
Translations 30112022

See merge request openlp/openlp!514
2022-11-30 18:23:16 +00:00
Tim Bentley
b196a5cde4 Translations 30112022 2022-11-30 18:23:15 +00:00
332741f9b7 Merge branch 'remove-form-tags-from-chords' into 'master'
Remove formatting tags from lyrics used for chord stage view

See merge request openlp/openlp!511
2022-11-30 14:38:10 +00:00
82ef139a2d Merge branch 'issue-1216' into 'master'
Fix file hash not being generated

Closes #1216

See merge request openlp/openlp!513
2022-11-30 14:37:43 +00:00
a8c1536614 Fix file hash not being generated 2022-11-30 14:37:42 +00:00
a9df04b796 Merge branch 'issue-1187' into 'master'
Handle different versions of pymediainfo

Closes #1187

See merge request openlp/openlp!512
2022-11-30 14:37:27 +00:00
d5080b0872 Handle different versions of pymediainfo, fixes #1187 2022-11-29 16:10:30 -07:00
Tomas Groth
412ebc56e4 Remove formatting tags from lyrics used for chord stage view 2022-11-29 22:03:43 +01:00
75020cdba4 Merge branch 'screen-flicker-fix' into 'master'
Handling screen display change corner cases

Closes #1212

See merge request openlp/openlp!509
2022-11-28 18:16:15 +00:00
25b01b0bd4 Merge branch 'planningcenter-test-fix' into 'master'
Fixing PlanningCenter's plugin test

See merge request openlp/openlp!510
2022-11-28 18:14:35 +00:00
Mateus Meyer Jiacomelli
6ceccf01cb planningcenter test fix due to locale differences 2022-11-23 13:23:21 -03:00
Mateus Meyer Jiacomelli
d430ad7e12 lint fix 2022-11-22 15:45:21 -03:00
Mateus Meyer Jiacomelli
38ed507560 creating ConfigScreenChangedEmitter singleton to encapsulate debounced screen change emitter; simplifying main_window's screen_changed warning modal condition 2022-11-22 15:44:36 -03:00
Mateus Meyer Jiacomelli
4cb5cca85d creating ConfigScreenChangedEmitter singleton to encapsulate debounced screen change emitter; simplifying main_window's screen_changed warning modal condition 2022-11-22 15:40:54 -03:00
Mateus Meyer Jiacomelli
58a07e5058 Merge branch 'master' into screen-flicker-fix 2022-11-21 11:59:24 -03:00
Mateus Meyer Jiacomelli
b9d507b455 fixing tests 2022-11-21 11:46:43 -03:00
Mateus Meyer Jiacomelli
2f3a575e7c preserving hide mode after screen change 2022-11-21 11:19:40 -03:00
Mateus Meyer Jiacomelli
f79f8ae4cd storing screen changed timestamp after modal dismissed 2022-11-19 17:27:07 -03:00
Mateus Meyer Jiacomelli
3067175ff5 handling screen display change corner cases 2022-11-19 17:12:30 -03:00
cbd79faa40 Merge branch 'issue-1185' into 'master'
Handle a corrupted header in WordProject files (fixes #1185)

Closes #1185

See merge request openlp/openlp!508
2022-11-19 00:35:51 +00:00
d1fc00a462 Handle a corrupted header in WordProject files (fixes #1185) 2022-11-17 13:37:05 -07:00
0ecc316bce Merge branch 'issue-1068' into 'master'
Fix issue with theme backgrounds disappearing

Closes #1068

See merge request openlp/openlp!507
2022-11-17 17:03:52 +00:00
9f03336898 Fix issue with theme backgrounds disappearing 2022-11-17 17:03:52 +00:00
Tomas Groth
ef1e5685b2 Merge branch 'issue-1200' into 'master'
Silence any errors from the LibreOffice shutdown on macOS

Closes #1200

See merge request openlp/openlp!505
2022-11-14 20:58:57 +00:00
Tomas Groth
6d69d5c457 Merge branch 'downgrade-pyinstaller' into 'master'
Downgrade PyInstaller to 4.9 to make the installers work again

See merge request openlp/openlp!506
2022-11-14 20:58:00 +00:00
08741ddbdb Downgrade PyInstaller to 4.9 to make the installers work again 2022-11-14 13:48:29 -07:00
Raoul Snyman
481b030a5f Silence any errors from the LibreOffice shutdown on macOS, usually due to users closing LibreOffice, fixes #1200 2022-11-14 12:42:42 -07:00
Tim Bentley
16a47c6a59 Merge branch 'issue-1167' into 'master'
Update MR !489 to better detect the encoding of the file being imported.

Closes #1167

See merge request openlp/openlp!504
2022-11-14 19:19:41 +00:00