|
|
35723ed72c
|
Fix issue #937 by handling custom verse types correctly
|
2022-02-02 11:28:46 -07:00 |
|
|
|
9b1fb4fe9f
|
Merge branch 'issue-989-no-context-menu' into 'master'
Move the common context menu code into the FolderLibraryItem class
Closes #989
See merge request openlp/openlp!394
|
2022-02-02 14:58:46 +00:00 |
|
|
|
b6074ed9ad
|
Move the common context menu code into the FolderLibraryItem class
|
2022-02-01 16:02:17 -07:00 |
|
Tim Bentley
|
f711a64dc5
|
Merge branch 'Logging_Fixes' into 'master'
Clean up logging
See merge request openlp/openlp!392
|
2022-02-01 20:01:27 +00:00 |
|
Tim Bentley
|
04bbbba305
|
Merge branch 'pjlink_cmd' into 'master'
Update pjlinkcommands tests
Closes #976 and #978
See merge request openlp/openlp!388
|
2022-02-01 16:43:09 +00:00 |
|
|
|
e02b359b7e
|
Update pjlinkcommands tests
|
2022-02-01 16:43:09 +00:00 |
|
Tim Bentley
|
79714f0b73
|
Merge branch '30rc1-fixes-part2' into 'master'
Various bugfixes
Closes #916 and #944
See merge request openlp/openlp!387
|
2022-02-01 11:11:52 +00:00 |
|
Tomas Groth
|
5e4721f4ce
|
Various bugfixes
|
2022-02-01 11:11:52 +00:00 |
|
Tim Bentley
|
c9c8c62595
|
Merge branch 'Chinese-new-year' into 'master'
Better late than never
See merge request openlp/openlp!391
|
2022-02-01 11:11:36 +00:00 |
|
Tim
|
29db2f1fb7
|
Better late than never
|
2022-02-01 10:10:57 +00:00 |
|
Tim
|
5784dc4c24
|
Fix another division issue
|
2022-02-01 10:07:24 +00:00 |
|
|
|
e30fb26a3c
|
Merge branch 'pjm-tests' into 'master'
Tests for ProjectorManager 2022-01-23
See merge request openlp/openlp!386
|
2022-01-31 02:36:14 +00:00 |
|
|
|
2d0855f975
|
Tests for ProjectorManager 2022-01-23
|
2022-01-31 02:36:14 +00:00 |
|
Tomas Groth
|
d2f02a5ec3
|
Merge branch 'fix-macos-display-minimize' into 'master'
Stop the display window from minimizing when the OpenLP window is not active on macOS
See merge request openlp/openlp!390
|
2022-01-30 07:34:33 +00:00 |
|
Tomas Groth
|
e03613bafe
|
Merge branch 'fix-macos-libreoffice-hang' into 'master'
Fix hanging in macOS when LibreOffice is installed
See merge request openlp/openlp!389
|
2022-01-30 07:33:43 +00:00 |
|
|
|
fa802a5f3b
|
Stop the display window from minimizing when the OpenLP window is not active on macOS
|
2022-01-29 16:22:10 -07:00 |
|
|
|
daa7539dd0
|
Fix hanging in macOS when LibreOffice is installed
|
2022-01-29 12:40:57 -07:00 |
|
Tim Bentley
|
ff0605cb21
|
Merge branch 'fix-915-songs-background-audio-auto-start' into 'master'
Restore the auto-play for background audio in songs (fixes #915)
Closes #915
See merge request openlp/openlp!385
|
2022-01-24 08:40:29 +00:00 |
|
|
|
70fa22fdb4
|
Restore the auto-play for background audio in songs (fixes #915)
|
2022-01-22 13:21:31 -07:00 |
|
|
|
91322f87d2
|
Merge branch '30rc1-fixes2' into 'master'
Various bug fixes
Closes #978 and #976
See merge request openlp/openlp!384
|
2022-01-21 21:32:09 +00:00 |
|
Tomas Groth
|
1d0b578370
|
Various bug fixes
|
2022-01-21 21:32:09 +00:00 |
|
|
|
b3c27986c7
|
Merge branch 'proj_manager_tests' into 'master'
ProjectorManager tests upd_add_port listener
See merge request openlp/openlp!383
|
2022-01-21 21:30:52 +00:00 |
|
|
|
caa78be00d
|
ProjectorManager tests upd_add_port listener
|
2022-01-21 21:30:51 +00:00 |
|
Tim Bentley
|
4f9ab2aa05
|
Merge branch '30rc1-fixes' into 'master'
A few bug fixes
Closes #958
See merge request openlp/openlp!382
|
2022-01-21 07:49:55 +00:00 |
|
Tomas Groth
|
bfce3db902
|
A few bug fixes
|
2022-01-21 07:49:55 +00:00 |
|
Tim Bentley
|
2143d89d1d
|
Merge branch 'proj_manager_tests' into 'master'
ProjectorManager tests
See merge request openlp/openlp!381
|
2022-01-20 21:22:41 +00:00 |
|
|
|
c0713a56d4
|
ProjectorManager tests
|
2022-01-20 21:22:41 +00:00 |
|
|
|
51623ebf95
|
Merge branch 'release-2.9.4' into 'master'
Release 2.9.4
See merge request openlp/openlp!380
|
2022-01-17 20:14:04 +00:00 |
|
|
|
2e553a6833
|
Release 2.9.4
|
2022-01-17 13:02:54 -07:00 |
|
Tomas Groth
|
1334d50e74
|
Merge branch 'fix-unsaved-service-issues' into 'master'
Fix a few service bugs
Closes #908 and #907
See merge request openlp/openlp!350
|
2022-01-16 13:15:10 +00:00 |
|
Daniel Martin
|
fce6b47127
|
Fix a few service bugs
|
2022-01-16 13:15:09 +00:00 |
|
Tim Bentley
|
645db61b47
|
Merge branch 'fixes-jan2022' into 'master'
Fix another division issue
See merge request openlp/openlp!379
|
2022-01-14 21:41:34 +00:00 |
|
Tim
|
2ee161c9ce
|
Fix another division issue
|
2022-01-13 14:33:00 +00:00 |
|
Tim Bentley
|
ba0d4c3622
|
Merge branch 'translations-28122021' into 'master'
Translations 28122021
See merge request openlp/openlp!376
|
2021-12-29 21:47:14 +00:00 |
|
Tim
|
3f7495c2c7
|
Add translations
|
2021-12-28 10:00:21 +00:00 |
|
Tim
|
4d2be29aa7
|
remove translations
|
2021-12-28 09:52:16 +00:00 |
|
Tim Bentley
|
e891cc066d
|
Merge branch 'fix-windows-issue' into 'master'
Default to the first screen if there is no display screen
See merge request openlp/openlp!375
|
2021-12-26 09:45:34 +00:00 |
|
|
|
e473511386
|
Default to the first screen if there is no display screen
|
2021-12-26 09:45:34 +00:00 |
|
|
|
91f4e6d8bc
|
Merge branch 'Ui-Fixes' into 'master'
OpenLP not running due to various Float / Int issues.
See merge request openlp/openlp!372
|
2021-11-28 14:13:29 +00:00 |
|
Tim Bentley
|
1603bfb705
|
OpenLP not running due to various Float / Int issues.
|
2021-11-28 14:13:28 +00:00 |
|
Tim Bentley
|
b9f27a5252
|
Merge branch 'random-cleanups-3' into 'master'
Random cleanups
See merge request openlp/openlp!371
|
2021-11-27 08:58:58 +00:00 |
|
Tim Bentley
|
bd22fef304
|
Merge branch 'issue-925-no-attr-current_hide_mode' into 'master'
Prevent an exception occurring due to a variable not being declared yet
Closes #925
See merge request openlp/openlp!373
|
2021-11-27 07:49:39 +00:00 |
|
|
|
33be82042d
|
Prevent an exception occurring due to a variable not being declared yet
|
2021-11-27 07:49:39 +00:00 |
|
|
|
b35080fd98
|
Merge branch 'correct-slide-number-fix' into 'master'
Correction of previous fix for setting slide numbers in footers
Closes #942
See merge request openlp/openlp!366
|
2021-11-26 22:08:03 +00:00 |
|
robbie jackson
|
8e1ff6e0d6
|
Correction of previous fix for setting slide numbers in footers
|
2021-11-26 22:08:03 +00:00 |
|
|
|
26d029fc5c
|
Merge branch 'appveyor-updates' into 'master'
Updating packages used by appveyor builds, and user native qt from appveyor
See merge request openlp/openlp!355
|
2021-11-26 21:45:22 +00:00 |
|
Tomas Groth
|
6e5b94f2c9
|
Updating packages used by appveyor builds, and user native qt from appveyor
|
2021-11-26 21:45:21 +00:00 |
|
Tim Bentley
|
d5876fc576
|
Merge branch 'check-end-html-instead-of-end-tag' into 'master'
Check 'end html' instead of 'end tag'
See merge request openlp/openlp!363
|
2021-11-10 17:35:26 +00:00 |
|
Tim Bentley
|
c6be2ac31d
|
Merge branch 'clean-up-alerts-plugin' into 'master'
clean up alertsmanager
See merge request openlp/openlp!369
|
2021-11-07 07:43:20 +00:00 |
|
|
|
e4036ea14f
|
Merge branch 'fix-song-flash-840' into 'master'
Fix song flash
Closes #840
See merge request openlp/openlp!367
|
2021-11-07 00:52:53 +00:00 |
|
