Commit Graph

3107 Commits

Author SHA1 Message Date
István Máté
58800cf4be Webserver mimetype support 2021-08-25 19:28:15 +00:00
Tim Bentley
b10fd605b7 Merge branch 'alert-fix' into 'master'
Alert scroll missing text + default font mismatch fix

See merge request openlp/openlp!336
2021-08-19 16:30:49 +00:00
Mateus Meyer Jiacomelli
7d0990021d Alert scroll missing text + default font mismatch fix 2021-08-19 16:30:49 +00:00
Tim Bentley
0e4055664c Merge branch 'issue-711-screen-geometry' into 'master'
Fix logic in get_screen_number to be more fault tolerant

Closes #711

See merge request openlp/openlp!342
2021-08-19 16:29:58 +00:00
Tim Bentley
73bb4690b9 Merge branch 'add-new-service-message' into 'master'
Output message box when a user clicks on New Service when there's already a blank service there.

Closes #777

See merge request openlp/openlp!345
2021-08-19 16:25:02 +00:00
robbie jackson
aee5d5b495 Fix main window positioning 2021-08-19 16:23:56 +00:00
robbiejackson
cdc1234ebb code and settings test done 2021-08-18 18:59:29 +01:00
322f4f1d5b Fix bug #711 and add some tests 2021-08-06 08:24:44 -07:00
Tim Bentley
e048348890 Merge branch 'add-slide-numbers-in-song-footer' into 'master'
Add slide numbers in footers

Closes #847

See merge request openlp/openlp!339
2021-07-22 20:48:16 +00:00
robbie jackson
3bbb46cdd3 Add slide numbers in footers 2021-07-22 20:48:15 +00:00
Scott Western
0eb4e4b99e Use CSS standard gradients 2021-07-21 20:44:41 +00:00
robbie jackson
ddcfd34ef3 Test reselected theme stream 2021-07-03 18:30:59 +00: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
robbiejackson
4ff585a774 fixes applied and some associated tests written 2021-05-21 20:38:35 +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
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
Tim Bentley
ac6aae9a3a Update Tests - 02 2021-04-15 17:25:59 +00:00
Daniel Martin
99190ebe56 Fix data directory copy fail 2021-04-03 15:56:47 +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
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
Daniel Martin
7d71b70d62 Fix reset footer template 2021-03-08 21:14:49 +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
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
Tomas Groth
520362a469 A few beta1 fixes 2021-02-10 07:51:16 +00:00
Daniel Martin
a327b70dc5 Fix missing image service load crash 2021-02-06 15:48:08 +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
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
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