robbie jackson
|
3bbb46cdd3
|
Add slide numbers in footers
|
2021-07-22 20:48:15 +00:00 |
|
Tomas Groth
|
911a3528b7
|
Merge branch 'test-reselected-theme-stream' into 'master'
Test reselected theme stream
See merge request openlp/openlp!334
|
2021-07-03 18:31:01 +00:00 |
|
robbie jackson
|
ddcfd34ef3
|
Test reselected theme stream
|
2021-07-03 18:30:59 +00:00 |
|
Tim Bentley
|
fcb30cb4c1
|
Merge branch 'fix-sendtolive-service-item-from-remote' into 'master'
Fix sending service item to live from remote starts at nth slide
See merge request openlp/openlp!333
|
2021-06-24 20:46:48 +00:00 |
|
STEPHANVS
|
7bbc7ab05f
|
Merge branch 'master' of https://gitlab.com/istvanmate/openlp
|
2021-06-18 23:45:56 +02:00 |
|
|
|
88f7a805f8
|
Merge branch 'fix_tests' into 'master'
Fix tests (broken on newer versions of pytest-qt)
See merge request openlp/openlp!332
|
2021-06-18 05:19:44 +00:00 |
|
Daniel Martin
|
00d5570d1d
|
Fix tests (broken on newer versions of pytest-qt)
|
2021-06-18 05:19:44 +00:00 |
|
Tim Bentley
|
bb2a3dfdbe
|
Merge branch 'win-pack-fixes' into 'master'
Fix pyinstaller incompabilities by using fixed version of packages
See merge request openlp/openlp!326
|
2021-06-17 20:56:48 +00:00 |
|
Tomas Groth
|
2ac1598452
|
Fix pyinstaller incompabilities by using fixed version of packages
|
2021-06-17 20:56:48 +00:00 |
|
Tim Bentley
|
47e49dd845
|
Merge branch 'fix-reselected-theme-stream' into 'master'
Fix reselected theme stream
Closes #576
See merge request openlp/openlp!330
|
2021-06-17 20:56:05 +00:00 |
|
Tim Bentley
|
b4570b9ad0
|
Merge branch 'fix-screen-number-misalignment' into 'master'
Fixes associated with Openlp crashing when display screen unplugged
Closes #794
See merge request openlp/openlp!331
|
2021-06-17 20:55:03 +00:00 |
|
robbiejackson
|
1feeadf3bb
|
review comments applied
|
2021-05-26 08:56:20 +01:00 |
|
robbiejackson
|
4ff585a774
|
fixes applied and some associated tests written
|
2021-05-21 20:38:35 +01:00 |
|
robbiejackson
|
00b83b5c7d
|
fix vsize bug
|
2021-05-13 10:43:55 +01:00 |
|
robbiejackson
|
4f08c25b6b
|
several bugs relating to theme stream UI fixed
|
2021-05-13 10:29:29 +01:00 |
|
Tomas Groth
|
0fffbb2f17
|
Merge branch 'fix-sequential-presentations-2' into 'master'
Fix sequential presentations - proper fix
Closes #700
See merge request openlp/openlp!324
|
2021-04-28 07:10:27 +00:00 |
|
robbie jackson
|
5793526bcb
|
Fix sequential presentations - proper fix
|
2021-04-28 07:10:27 +00:00 |
|
|
|
431c4fe6ee
|
Merge branch 'fix-printicons' into 'master'
Fix Icons in Print when Dark Theme.
See merge request openlp/openlp!325
|
2021-04-28 06:38:59 +00:00 |
|
Tim
|
ee28fad5b4
|
Fix Icons in Print when Dark Theme.
Fix Test notes following clean up
|
2021-04-28 07:30:26 +01:00 |
|
|
|
4d4717a905
|
Merge branch 'more_media_fixes' into 'master'
More media fixes
Closes #665 and #815
See merge request openlp/openlp!323
|
2021-04-28 06:19:48 +00:00 |
|
Daniel Martin
|
7cc367801a
|
More media fixes
|
2021-04-28 06:19:47 +00:00 |
|
Tim Bentley
|
b81d7e753c
|
Merge branch 'fix_service_save_failure' into 'master'
Fix service save failure
Closes #816
See merge request openlp/openlp!322
|
2021-04-25 06:18:50 +00:00 |
|
Daniel Martin
|
0ab55950a8
|
Fix service save failure
|
2021-04-25 06:18:50 +00:00 |
|
Tim Bentley
|
8381adfc36
|
Merge branch 'fix_websocket_crash' into 'master'
Fix websocket crash
Closes #810
See merge request openlp/openlp!315
|
2021-04-25 06:18:16 +00:00 |
|
Daniel Martin
|
d34e39524a
|
Fix websocket crash
|
2021-04-25 06:18:16 +00:00 |
|
|
|
93a51371ab
|
Merge branch 'more_fixes' into 'master'
More fixes
Closes #818 and #812
See merge request openlp/openlp!320
|
2021-04-25 05:15:38 +00:00 |
|
Daniel Martin
|
b5b510b2ed
|
More fixes
|
2021-04-25 05:15:37 +00:00 |
|
|
|
5025140141
|
Merge branch 'test_updates_01' into 'master'
Test Migration and Cleanup - 1
See merge request openlp/openlp!318
|
2021-04-24 16:55:39 +00:00 |
|
Tim Bentley
|
9039fe04f8
|
Test Migration and Cleanup - 1
|
2021-04-24 16:55:38 +00:00 |
|
|
|
5caca527e1
|
Merge branch 'confirmation-form' into 'master'
Confirmation form
Closes #675
See merge request openlp/openlp!313
|
2021-04-15 17:33:10 +00:00 |
|
robbie jackson
|
d7fe052afc
|
Confirmation form
|
2021-04-15 17:33:10 +00:00 |
|
|
|
25b67f802d
|
Merge branch 'oo-presenter-screen' into 'master'
Sets PresenterScreen for OpenOffice if EnablePresenterScreen for LibreOffice fails
Closes #806
See merge request openlp/openlp!316
|
2021-04-15 17:29:49 +00:00 |
|
|
|
1473ba8bba
|
Merge branch 'test_update_02' into 'master'
Update Tests - 02
See merge request openlp/openlp!319
|
2021-04-15 17:25:59 +00:00 |
|
Tim Bentley
|
ac6aae9a3a
|
Update Tests - 02
|
2021-04-15 17:25:59 +00:00 |
|
robbiejackson
|
5b531b2900
|
sets PresenterScreen for openoffice if EnablePresenterScreen fails
|
2021-04-07 21:24:51 +01:00 |
|
Tomas Groth
|
61d6cddd0a
|
Merge branch 'fix_data_directory_copy_fail' into 'master'
Fix data directory copy fail
Closes #804
See merge request openlp/openlp!314
|
2021-04-03 15:56:47 +00:00 |
|
Daniel Martin
|
99190ebe56
|
Fix data directory copy fail
|
2021-04-03 15:56:47 +00:00 |
|
Tomas Groth
|
23d8ae98d0
|
Merge branch 'bible_fixes' into 'master'
Bible fixes
Closes #795, #808, and #495
See merge request openlp/openlp!312
|
2021-03-29 20:29:36 +00:00 |
|
Daniel Martin
|
8ee657bc8f
|
Add api data for bibles
Including version, copyright and permissions for primary and secondary bible.
|
2021-03-29 20:29:36 +00:00 |
|
Tim Bentley
|
ed3608bf47
|
Merge branch 'fix-impress-display' into 'master'
Fix impress display
Closes #30
See merge request openlp/openlp!309
|
2021-03-26 22:02:32 +00:00 |
|
|
|
5a55b28bb3
|
Merge branch 'sqlalchemy-update' into 'master'
Update database_exists method. maybe it will support multiple versions.
See merge request openlp/openlp!311
|
2021-03-26 21:21:43 +00:00 |
|
Tomas Groth
|
8ef650b6cb
|
Update database_exists method. maybe it will support multiple versions.
|
2021-03-26 21:21:42 +00:00 |
|
robbiejackson
|
0fa973d485
|
revert to using EnablePresenterScreen as property name
|
2021-03-22 09:09:55 +00:00 |
|
Tim Bentley
|
a9c3372dfa
|
Merge branch 'fix-ccli-notification' into 'master'
changed CCLI no access notification to be in message area
See merge request openlp/openlp!305
|
2021-03-10 17:42:17 +00:00 |
|
Tomas Groth
|
cc07ab572c
|
Merge branch 'fix-preview-pause-play' into 'master'
Fix preview video restart after pause or stop
See merge request openlp/openlp!306
|
2021-03-08 21:16:42 +00:00 |
|
Tomas Groth
|
819353b897
|
Merge branch 'icon-for-audio-files' into 'master'
changed so audio files are correctly identified
See merge request openlp/openlp!307
|
2021-03-08 21:15:45 +00:00 |
|
Tomas Groth
|
84bd998375
|
Merge branch 'fix_reset_footer' into 'master'
Fix reset footer template
See merge request openlp/openlp!308
|
2021-03-08 21:14:50 +00:00 |
|
Daniel Martin
|
7d71b70d62
|
Fix reset footer template
|
2021-03-08 21:14:49 +00:00 |
|
robbiejackson
|
60dafd80c0
|
remove unnecessary variable
|
2021-03-08 21:00:37 +00:00 |
|
robbiejackson
|
845402f8a3
|
fix lint problem with import pytest
|
2021-03-05 20:59:23 +00:00 |
|
