openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity
17,469 Commits 6 Branches 56 Tags 309 MiB
Commit Graph

17469 Commits

Author SHA1 Message Date
AVee1 3dc96aedae Add continuation_indent_size to editorconfig. 2022-10-26 05:21:49 +00:00
Tim Bentley 64e365b0fb Merge branch 'issue-1179' into 'master' 
Fix issue #1179 (generating slide data for a folder)

Closes #1179

See merge request openlp/openlp!498
 2022-10-21 06:25:54 +00:00
Raoul Snyman b4a33e29d9 Fix issue #1179 (generating slide data for a folder) 2022-10-21 06:25:54 +00:00
Raoul Snyman c6ba6fe0c8 Merge branch 'issue-1161' into 'master' 
Fix #1161 by saving and loading the state of individual docks

Closes #1161

See merge request openlp/openlp!497
 2022-10-21 05:56:48 +00:00
Raoul Snyman 1185a1bec1 Fix #1161 by saving and loading the state of individual docks 2022-10-20 18:58:41 -07:00
Tim Bentley 1f80b34536 Merge branch 'transpose-web-api' into 'master' 
Added a transpose endpoint to the web api

See merge request openlp/openlp!472
 2022-10-19 11:50:22 +00:00
Tomas Groth bca97f03a7 Added a transpose endpoint to the web api 2022-10-19 11:50:22 +00:00
Tomas Groth 9df9509419 Merge branch 'bug-1144' into 'master' 
Fix linked audio in the service files, fixes bug #1144.

Closes #1144

See merge request openlp/openlp!496
 2022-10-18 17:15:27 +00:00
Tomas Groth b69491979e Fix linked audio in the service files, fixes bug #1144. 2022-10-18 17:15:26 +00:00
Raoul Snyman 7335188273 Merge branch 'settings' into 'master' 
Fix Incorrect settings code

See merge request openlp/openlp!495
 2022-10-12 19:58:21 +00:00
Tim Bentley 9e6f0b1116 Fix Incorrect settings code 2022-10-12 19:58:21 +00:00
Tim Bentley b6a4dab45c Merge branch 'openlp-servicemanager-newtests-2022-02-25' into 'master' 
Add a few tests for service manager

See merge request openlp/openlp!494
 2022-10-07 14:24:07 +00:00
Raoul Snyman b9158947f0 Add a few tests for service manager 2022-10-07 14:24:07 +00:00
Raoul Snyman 7bb4c38468 Merge branch 'disable_context_menu' into 'master' 
Disable context menu

See merge request openlp/openlp!492
 2022-09-29 02:42:58 +00:00
AVee1 2d581ac8ad Disable context menu 2022-09-29 02:42:58 +00:00
Raoul Snyman 12af34d1cc Merge branch 'bugfix/service_item_path' into 'master' 
Fix service item path

Closes #1154

See merge request openlp/openlp!490
 2022-09-29 02:33:03 +00:00
Raoul Snyman 1bc87f7c4f Merge branch 'issue-1181' into 'master' 
Add a property to Book to fix #1181

Closes #1181

See merge request openlp/openlp!493
 2022-09-29 02:32:36 +00:00
Raoul Snyman 8c94c53d30 Add a property to Book to fix #1181 2022-09-27 22:11:13 -07:00
Vitor Mattos f164b2b677 Fix service item path 2022-08-29 13:28:17 -03:00
Tim Bentley e14307111b Merge branch 'more-editverseform-tests' into 'master' 
Add more tests around the EditVerseForm

See merge request openlp/openlp!488
 2022-08-16 06:56:29 +00:00
Raoul Snyman 1deb7fa1c5 Add more tests around the EditVerseForm 2022-08-15 23:12:14 -07:00
Tim Bentley ace1995952 Merge branch 'fix-issue-1151' into 'master' 
Fix an attribute error in EditVerseForm

Closes #1151

See merge request openlp/openlp!487
 2022-08-15 06:07:05 +00:00
Raoul Snyman 25a2bbdca1 Fix an attribute error in EditVerseForm 2022-08-15 06:07:05 +00:00
Raoul Snyman b8eaa74e77 Merge branch 'release-2.9.5' into 'master' 
Release version 2.9.5

See merge request openlp/openlp!486
 2022-08-14 06:50:33 +00:00
Raoul Snyman 4e818cc195 Release version 2.9.5 2022-08-13 15:22:06 -07:00
Tim Bentley 0e35204880 Merge branch 'fix-issue-1147' into 'master' 
Fall back on the file name if there is no hash

Closes #1147

See merge request openlp/openlp!485
 2022-08-13 21:11:47 +00:00
Raoul Snyman 80f0d19393 Fall back on the file name if there is no hash 2022-08-13 13:52:39 -07:00
Tim Bentley b298454d17 Merge branch 'fix-register-views-error' into 'master' 
Fix up some of the tests on AppVeyor

See merge request openlp/openlp!483
 2022-08-13 20:40:12 +00:00
Raoul Snyman 280fc1b31d Fix up some of the tests on AppVeyor 2022-08-13 20:40:12 +00:00
Tim Bentley d6a238af83 Merge branch 'fix-app-veyor-vlc' into 'master' 
Fix the VLC installation command for the tests

See merge request openlp/openlp!482
 2022-08-12 16:43:30 +00:00
Raoul Snyman 4dad84864a Merge branch 'translations-12082022' into 'master' 
Translations 12082022

See merge request openlp/openlp!480
 2022-08-12 16:06:25 +00:00
Tim Bentley ceaf9590ed Translations 12082022 2022-08-12 16:06:25 +00:00
Raoul Snyman c84b59b0b7 Fix the VLC installation command for the tests 2022-08-12 09:04:58 -07:00
Raoul Snyman 18261b4352 Merge branch 'Remove-zero' into 'master' 
Remove ZeroConf as not used

See merge request openlp/openlp!481
 2022-08-12 16:03:12 +00:00
Tim Bentley 13ab80b13d Remove ZeroConf as not used 2022-08-12 16:03:11 +00:00
Tim Bentley 7b33e2e8e6 Merge branch 'force-pyqt5-in-pytest-qt' into 'master' 
Force pytest-qt to use PyQt5

See merge request openlp/openlp!478
 2022-08-12 06:47:11 +00:00
Tim Bentley 4ca282a35d Merge branch 'fix-appveyor-tests' into 'master' 
Install VLC before running tests

See merge request openlp/openlp!479
 2022-08-12 06:46:46 +00:00
Raoul Snyman 8cb8119dfd Install VLC before running tests 2022-08-11 22:44:34 -07:00
Raoul Snyman 0a1366af22 Force pytest-qt to use PyQt5 2022-08-11 22:26:40 -07:00
Tim Bentley 542be51f14 Merge branch 'fix-applocation-test' into 'master' 
Fix some tests

See merge request openlp/openlp!471
 2022-08-11 06:45:51 +00:00
Tim Bentley a15fafb05e Merge branch 'background-audio-starting-issues' into 'master' 
Fix the song background audio not starting (or always starting)

See merge request openlp/openlp!477
 2022-08-11 06:45:14 +00:00
Raoul Snyman 1fc297c8d3 Fix the song background audio not starting (or always starting) 2022-08-11 06:45:14 +00:00
Tim Bentley 85dec929b5 Merge branch 'fix-951-1142-no-remote-version' into 'master' 
Correctly handle an issue where OpenLP is unable to download the remote version (fixes #1142 #951)

Closes #951 and #1142

See merge request openlp/openlp!475
 2022-08-11 06:43:46 +00:00
Tim Bentley 7e684640d6 Merge branch 'reset-css' into 'master' 
Fix centering of text in the slides

See merge request openlp/openlp!474
 2022-08-11 06:42:58 +00:00
Raoul Snyman 5331c2eb05 Fix some tests on Windows 
- Remove the old conditional AppLocation tests
- Fix the AppLocation test
- Fix VLC test on Windows
- Handle UTF-8 BOM in EasySlides importer
 2022-08-10 12:30:51 -07:00
Raoul Snyman f2e8b6f60b Correctly handle an issue where OpenLP is unable to download the remote version (fixes #1142 #951) 2022-08-10 11:57:43 -07:00
Raoul Snyman 4aa02145c0 Fix centering of text in the slides 2022-08-10 10:42:24 -07:00
Raoul Snyman 1c7ea6c9fa Merge branch 'translations-07082022' into 'master' 
Translations 07082022

See merge request openlp/openlp!473
 2022-08-09 03:41:17 +00:00
Tim Bentley 72a68909a7 Translations 07082022 2022-08-09 03:41:17 +00:00
Tim Bentley d38d3562b2 Merge branch 'issue-1005' into 'master' 
Handle a case where an exception is thrown when OpenLP is shutting down (fixes #1005)

Closes #1005

See merge request openlp/openlp!470
 2022-07-22 20:54:10 +00:00