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

17191 Commits

Author SHA1 Message Date
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
Tim 7c57f1168d
Fix bug #730 and #751 where DND images are loaded twice. 2021-01-28 14:01:09 +00:00
Sean DeArras 8e9150ba2a Fix chapter count for Zechariah 2021-01-24 13:56:17 -08:00
Tim Bentley c7112a1f78 Merge branch 'bible-fixes' into 'master' 
Fixes for the bible plugin.

See merge request openlp/openlp!290
 2021-01-21 07:59:35 +00:00
Tomas Groth 282a845a10 Fixes for the bible plugin. Fix placement of alternative_book_names.sqlite for portable installs. Fix gui elements not updating when only one bible is available. 2021-01-21 07:59:34 +00:00
Tomas Groth 9f41ce1159 Merge branch 'appveyor-py38-again' into 'master' 
Retry setting appveyor to set python version to 3.8 so that windows 7 is supported.

See merge request openlp/openlp!289
 2021-01-20 19:30:22 +00:00
Tim Bentley 53b061dac6 Merge branch 'Issue-740' into 'master' 
Handle load of Service with missing Plugin - Issue 740

Closes #740

See merge request openlp/openlp!288
 2021-01-19 21:53:24 +00:00
Tomas Groth 8d235e04db Retry setting appveyor to set python version to 3.8 so that windows 7 is supported. 2021-01-19 21:22:27 +01:00
Tim e682f39fe6
Fix bug #740 where plugin is not loaded. 2021-01-18 15:44:43 +00:00
Tim b4627896d3
Merge branch 'master' of gitlab.com:openlp/openlp 2021-01-12 12:03:11 +00:00
Tim Bentley 965dd70567 Merge branch 'fix_http_poll' into 'master' 
Fix http poll routes

Closes #707

See merge request openlp/openlp!283
 2021-01-08 15:01:54 +00:00
Daniel Martin da31226029 Fix http poll routes 2021-01-08 15:01:53 +00:00
Tomas Groth 9194273341 Merge branch 'enable_qt_dpi_scaling' into 'master' 
Enable QT DPI scaling

See merge request openlp/openlp!287
 2021-01-03 17:37:20 +00:00
Tomas Groth 561745166a Merge branch 'fix_#713' into 'master' 
Fix #713 - Bible Combo Crash

Closes #713

See merge request openlp/openlp!284
 2021-01-03 17:34:39 +00:00
Tim Bentley b27f0c69d7 Fix #713 - Bible Combo Crash 2021-01-03 17:34:39 +00:00
Tomas Groth 714d69ad6a Merge branch 'fix_missing_text' into 'master' 
Fix missing text with optional splits on some themes

Closes #714

See merge request openlp/openlp!286
 2021-01-03 14:32:00 +00:00
Daniel Martin 7b8c4a31c9 Prevent empty slides being added 
And some comments and grammer
 2021-01-03 14:32:00 +00:00
Tim 6d9fafa020
Merge branch 'master' of gitlab.com:openlp/openlp 2021-01-01 08:02:54 +00:00
Daniel c8c2c41641 enable qt dpi scaling 2020-12-31 20:23:58 +13:00
Tim Bentley 418c0861d7 Merge branch 'End_of_2020' into 'master' 
End of 2020 - Just change the Year!

See merge request openlp/openlp!285
 2020-12-30 21:42:49 +00:00
Tim Bentley aade849aca End of 2020 - Just change the Year! 2020-12-30 21:42:49 +00:00
Tomas Groth 303b3ded15 Merge branch 'update-all-icons' into 'master' 
Update the icons -- these are used on some Linux platforms

See merge request openlp/openlp!282
 2020-12-22 07:34:53 +00:00
Tomas Groth 010c01ba6d Merge branch 'fix-pytest-fixtures' into 'master' 
Yield fixtures are deprecated; the regular fixture does the same job

See merge request openlp/openlp!281
 2020-12-22 07:33:32 +00:00
Raoul Snyman 3ef8cbd2fa
Update the icons -- these are used on some Linux platforms 2020-12-22 00:27:05 -07:00
Tomas Groth 30c410ab83 Merge branch 'appveyor-release' into 'master' 
Try to fix and force release build

See merge request openlp/openlp!280
 2020-12-22 07:19:38 +00:00
Tomas Groth 5f9848a0be Try to fix and force release build 2020-12-22 07:19:38 +00:00
Raoul Snyman 3fb4eee9f3
Yield fixtures are deprecated; the regular fixture does the same job 2020-12-21 21:41:57 -07:00
Tim 7698c5da8c
Merge branch 'master' of gitlab.com:openlp/openlp 2020-12-21 14:15:16 +00:00