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

17175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Raoul Snyman
e473511386 Default to the first screen if there is no display screen 2021-12-26 09:45:34 +00:00
Raoul Snyman
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
Raoul Snyman
33be82042d Prevent an exception occurring due to a variable not being declared yet 2021-11-27 07:49:39 +00:00
Raoul Snyman
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
Raoul Snyman
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
Raoul Snyman
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
robbie jackson
aff97c0e27 Fix song flash 2021-11-07 00:52:53 +00:00
Tomas Groth
4db9e333b9 Merge branch 'readme-rewrite' into 'master' 
rename readme in test folder and fix text about dependencies

See merge request openlp/openlp!368
 2021-11-06 16:18:30 +00:00
Andreas P
cbfcbae498 remove not reachable code 2021-10-23 16:14:16 +02:00
Andreas P
2c8dd847c0 don't shadow build-in 2021-10-23 16:14:15 +02:00
Andreas P
25952c8751 use f-strings and correct log message, as the icon is shaddowed 2021-10-23 15:48:48 +02:00
Andreas P
ddcc7dbd4f clean up alertsmanager 
- the alertsmanager does not manage the alerts anymore, they are managed by the display
- thus the list of alerts is not needed, the id is not needed, also the
  timer id is not needed
- live_display_active is not needed anymore
- there is no point in using the status message
 2021-10-23 15:29:33 +02:00
Andreas P
a252032426 rename readme in test folder and fix text about dependencies 2021-10-23 15:09:51 +02:00
Raoul Snyman
59f625bd8f Merge branch 'issue-839-loading-str-causes-exception' into 'master' 
Fix loading the previous service as a str instead of a Path

Closes #839

See merge request openlp/openlp!365
 2021-09-19 05:17:44 +00:00
Raoul Snyman
fca5052b24
Fix loading the previous service as a str instead of a Path 
- Fixes #839
- Wrote a whole bunch of tests
 2021-09-16 16:59:03 -07:00
Tim Bentley
191e8dc672 Merge branch 'fix-dvd-media-crash' into 'master' 
Fix dvd media crash

Closes #876

See merge request openlp/openlp!356
 2021-09-12 08:28:58 +00:00
robbie jackson
2eef92fe4a Fix dvd media crash 2021-09-12 08:28:58 +00:00
Tim Bentley
df0163b144 Merge branch 'fix-show-presentation-after-media' into 'master' 
Fix of problem showing presentations after media items

Closes #833

See merge request openlp/openlp!362
 2021-09-12 08:28:37 +00:00
STEPHANVS
14c0c93463
Check 'end html' instead of 'end tag' 2021-09-10 23:49:55 +02:00
robbiejackson
fee77506f6 code fix done and tests updated 2021-09-10 21:10:49 +01:00
Tim Bentley
9889f8f33c Merge branch 'issue-896-image-reorder-bug' into 'master' 
Fix #896 and write tests for the form

Closes #896

See merge request openlp/openlp!361
 2021-09-09 21:01:26 +00:00
Raoul Snyman
b37fd8faca Fix #896 and write tests for the form 2021-09-07 22:00:11 -07:00
Tim Bentley
d83eec024b Merge branch 'fix-replace-str' into 'master' 
A further and more extensive fix to the fix in !359

See merge request openlp/openlp!360
 2021-09-07 11:44:26 +00:00
Raoul Snyman
acc54ce13b
A further and more extensive fix to the fix in !359 2021-09-06 14:44:44 -07:00
Tim Bentley
5496745f98 Merge branch 'issue-912-fix-bibles-images' into 'master' 
Use the correct argument when adding service items remotely

Closes #912

See merge request openlp/openlp!359
 2021-09-06 07:13:04 +00:00
Raoul Snyman
bd6dfb43be
Fix #912 by using the correct argument; Also fix the tests on macOS (and now my machine) where some version of libxml2 has an error that causes syntax errors in the resulting XML 2021-09-05 22:42:21 -07:00
Tim Bentley
f469f0b55b Merge branch 'remove-darkdetect' into 'master' 
Remove the reference to darkdetect, it's not used anywhere

See merge request openlp/openlp!358
 2021-09-05 20:38:48 +00:00
Raoul Snyman
34f25ba20d
Remove the reference to darkdetect, it's not used anywhere 2021-09-05 09:48:20 -07:00
Tim Bentley
0ce03e9297 Merge branch 'theme-fixes' into 'master' 
Fix dark theme tooltip text color

See merge request openlp/openlp!357
 2021-09-05 07:19:44 +00:00
Mateus Meyer Jiacomelli
34cfe9b8cd Fix dark theme tooltip text color 2021-09-05 07:19:44 +00:00
Raoul Snyman
66e8063335 Merge branch 'skip-om-macos' into 'master' 
Skip test that fails on macOS.

See merge request openlp/openlp!354
 2021-09-02 20:43:42 +00:00
Tomas Groth
e584c5bf49 Skip test that fails on macOS. 2021-09-02 20:43:42 +00:00
Raoul Snyman
59c55fea4c Merge branch 'dont-run-tests-on-tag' into 'master' 
AppVeyor: Don't run tests on tags

See merge request openlp/openlp!353
 2021-09-02 20:24:58 +00:00
Raoul Snyman
d09c77f0a6 AppVeyor: Don't run tests on tags 2021-09-02 11:10:46 -07:00
Raoul Snyman
a03f208acc Merge branch 'release-2.9.3' into 'master' 
Release 2.9.3

See merge request openlp/openlp!352
 2021-09-02 17:47:04 +00:00