raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,018 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

17018 Commits

Author SHA1 Message Date
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
robbiejackson 48f91bcd30 added tests for settings presentation tab 2021-03-05 20:51:02 +00:00
robbiejackson 4e88c975ed code changes implemented 2021-03-05 10:19:16 +00:00
robbiejackson 9268194ca0 search changed so audio files are correctly identified 2021-02-23 22:07:00 +00:00
robbiejackson 9e0294024b fix preview video restart after pause or stop 2021-02-21 21:17:57 +00:00
Tomas Groth 8123f9d920 Merge branch 'fix-setting-custom-geometry' into 'master' 
Fix setting custom geometry

See merge request openlp/openlp!304
 2021-02-20 21:32:16 +00:00
robbie jackson febf2615b5 Fix setting custom geometry 2021-02-20 21:32:16 +00:00
robbiejackson b76045e783 changed CCLI no access notification to be in message area 2021-02-18 10:34:32 +00:00
Tim Bentley ed8da9512b Merge branch 'no-access-ccli' into 'master' 
fix for CCLI song select when the user's account has no access to the song

See merge request openlp/openlp!299
 2021-02-17 07:33:38 +00:00
robbie jackson 5ed56e388a fix for CCLI song select when the user's account has no access to the song 2021-02-17 07:33:37 +00:00
Tim Bentley 0060001b8f Merge branch 'beta1-fixes' into 'master' 
A few beta1 fixes

Closes #760

See merge request openlp/openlp!302
 2021-02-10 07:51:16 +00:00
Tomas Groth 520362a469 A few beta1 fixes 2021-02-10 07:51:16 +00:00
Tim Bentley b0d8d6fd85 Merge branch 'Allow-sub-directories-in-custom-stages' into 'master' 
Allow sub directories in custom stages

Closes #759

See merge request openlp/openlp!298
 2021-02-06 15:48:39 +00:00
Tim Bentley 45d642fb6a Merge branch 'fix_missing_image_service_load_crash' into 'master' 
Fix missing image service load crash

Closes #761

See merge request openlp/openlp!301
 2021-02-06 15:48:08 +00:00
Daniel Martin a327b70dc5 Fix missing image service load crash 2021-02-06 15:48:08 +00:00
Daniel aeac690c4e Allow sub directories in custom stages 2021-02-04 09:56:52 +13:00
Tim Bentley 6ff9c2041b Merge branch 'small_fixes' into 'master' 
Small fixes

See merge request openlp/openlp!297
 2021-02-02 09:28:20 +00:00
Daniel Martin 058bea7f4c Small fixes 2021-02-02 09:28:20 +00:00
Tomas Groth ec6015c7fb Merge branch 'standardize_plugin_search_options' into 'master' 
Standardize plugin search options

Closes #737

See merge request openlp/openlp!296
 2021-01-30 22:36:58 +00:00
Daniel Martin d47a14a716 Standardize plugin search options 2021-01-30 22:36:58 +00:00
Raoul Snyman 44901c4cf5 Merge branch 'Image_DragAndDrop' into 'master' 
Fix bug #730 and #751 where DND images are loaded twice.

See merge request openlp/openlp!292
 2021-01-30 06:03:05 +00:00
Raoul Snyman d465e692cd Merge branch 'master' into 'master' 
Fix chapter count for Zechariah

See merge request openlp/openlp!291
 2021-01-30 06:02:21 +00:00
Raoul Snyman 87bef4f934 Merge branch 'fix_songselect_non_english' into 'master' 
Fix songselect for non english

Closes #752 and #723

See merge request openlp/openlp!293
 2021-01-30 06:01:42 +00:00
Daniel Martin 81dc52110d Change song lyrics selector to fetch link via class name 
And get copyrights via lyrics page where the list has a class name
 2021-01-30 06:01:42 +00:00
Raoul Snyman 9975ad4e43 Merge branch 'fix_auto_unblank' into 'master' 
Fix auto unblank

Closes #729 and #181

See merge request openlp/openlp!294
 2021-01-30 05:59:57 +00:00
Daniel Martin ed129b8923 Fix auto unblank 2021-01-30 05:59:56 +00:00
Raoul Snyman 2279e61956 Merge branch 'make_images_fullscreen' into 'master' 
Make images fullscreen

Closes #731

See merge request openlp/openlp!295
 2021-01-30 05:02:57 +00:00
Daniel Martin 837b62ce39 Make images fullscreen 2021-01-30 05:02:57 +00:00