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

17600 Commits

Author SHA1 Message Date
Raoul Snyman e28aafa7dc Release 3.0.2 2023-02-07 11:05:43 -07:00
Raoul Snyman c737c81510 Merge branch 'issue-1338' into 'master' 
Only show hash if song book number exists

Closes #1338

See merge request openlp/openlp!573
 2023-02-07 18:01:50 +00:00
Raoul Snyman 8a30ba7a24 Only show hash if song book number exists 2023-02-07 18:01:49 +00:00
Raoul Snyman ec162af360 Merge branch 'vlx-fix' into 'master' 
FIX: Missing looping for theme background videos

See merge request openlp/openlp!572
 2023-02-06 16:23:56 +00:00
Tim Bentley 575f84858e FIX: Missing looping for theme background videos 2023-02-06 16:23:56 +00:00
Raoul Snyman 629e5f4b5f Merge branch 'topics-media-manager-icon-fix' into 'master' 
Fixing Songs' Topics media manager icon to be the same from the Song Maintenance dialog

See merge request openlp/openlp!570
 2023-02-01 20:40:43 +00:00
Mateus Meyer Jiacomelli 6ec62ecb82 Fixing Songs' Topics media manager icon to be the same from the Song Maintenance dialog 2023-02-01 20:40:43 +00:00
Raoul Snyman a9b9a4201d Merge branch 'api_transpose_service_item_format' into 'master' 
Adding ability to return transposed item with service_item format to avoid duplicate calls on remote

See merge request openlp/openlp!561
 2023-01-31 17:24:56 +00:00
Mateus Meyer Jiacomelli 42b15218c3 Adding ability to return transposed item with service_item format to avoid duplicate calls on remote 2023-01-31 17:24:56 +00:00
Raoul Snyman dd30257d67 Merge branch 'fix-openlyrics-chord-import-2' into 'master' 
Fix OpenLyrics whitespaces being 'eaten' (again)

Closes #1311

See merge request openlp/openlp!560
 2023-01-31 17:24:07 +00:00
Mateus Meyer Jiacomelli d2cf191d0a Fix OpenLyrics whitespaces being 'eaten' (again) 2023-01-31 17:24:07 +00:00
Tim Bentley d1f40383b3 Merge branch 'fix-service-manager-list-left-arrow-exception' into 'master' 
Fixing service manager's list exception when pressing 'Left' keyboard key without any item selected

Closes #1317

See merge request openlp/openlp!564
 2023-01-31 07:34:20 +00:00
Raoul Snyman d4a563a0d1 Merge branch 'translations-28012023' into 'master' 
Translations 28012023

See merge request openlp/openlp!559
 2023-01-31 04:12:56 +00:00
Tim Bentley fbe9df0f7e Translations 28012023 2023-01-31 04:12:56 +00:00
Mateus Meyer Jiacomelli c2e625a9f1 Fixing service manager's list exception when pressing 'Left' keyboard key without any item selected 2023-01-30 21:13:42 -03:00
Tim Bentley 56367b55cf Merge branch 'sqlalchemy-14' into 'master' 
Force the use of SqlAlchemy 1.4 for now

See merge request openlp/openlp!563
 2023-01-29 16:29:07 +00:00
Tomas Groth eb1c86227a Force the use of SqlAlchemy 1.4 for now 2023-01-29 16:29:07 +00:00
Tomas Groth 5f67baa415 Merge branch 'transpose-api-no-login' into 'master' 
Removing login requirement from transpose endpoint

Closes #1316

See merge request openlp/openlp!562
 2023-01-29 15:12:39 +00:00
Mateus Meyer Jiacomelli 77d6ec8d11 Removing login requirement from transpose endpoint 2023-01-28 19:10:45 -03:00
Raoul Snyman b4a502e0ce Merge branch 'issue-1104' into 'master' 
Handle verse ranges in BibleServer

Closes #1104

See merge request openlp/openlp!558
 2023-01-27 20:44:07 +00:00
Raoul Snyman 203feaeeef Handle verse ranges in BibleServer 2023-01-27 07:19:05 -07:00
Raoul Snyman 07be40fe3b Merge branch 'issue-1287' into 'master' 
Attempt to fix #1287 by checking for both str and bytes, and decoding bytes to unicode

Closes #1287

See merge request openlp/openlp!557
 2023-01-26 21:55:59 +00:00
Tomas Groth 5042992460 Merge branch 'issue-1295' into 'master' 
Fix up loading 2.9.x services

Closes #1295

See merge request openlp/openlp!556
 2023-01-25 05:29:00 +00:00
Raoul Snyman f060664c9f Fix up loading 2.9.x services 2023-01-25 05:29:00 +00:00
Raoul Snyman f4f39d8c0b Attempt to fix #1287 by checking for both str and bytes, and decoding bytes to unicode 2023-01-24 16:55:50 -07:00
Raoul Snyman bc6c1e629a Merge branch 'vlc_3a' into 'master' 
Add debugging for VLC and fix strange state.

See merge request openlp/openlp!555
 2023-01-21 05:29:31 +00:00
Tim Bentley 522e9041cd Add debugging for VLC and fix strange state. 2023-01-21 05:29:31 +00:00
Raoul Snyman 2d2e84b4ce Merge branch 'waiting-dialog-includes-presentation-shutdown' into 'master' 
Display the closing progress dialog during plugin shutdown

See merge request openlp/openlp!554
 2023-01-19 17:45:08 +00:00
Raoul Snyman 1ee8223d55 Display the closing progress dialog during plugin shutdown 2023-01-18 23:15:11 -07:00
Raoul Snyman c6bfc486f5 Merge branch 'fix-worshipcenterpro-bug' into 'master' 
Fix an issue with the Worship Center Pro importer

See merge request openlp/openlp!553
 2023-01-18 17:45:14 +00:00
Raoul Snyman d6c22432a1 Fix an issue with the Worship Center Pro importer 2023-01-17 19:46:04 -07:00
Raoul Snyman 4443a8aaa2 Merge branch 'issue-1281' into 'master' 
Fix an issue where the websockets server would try to shut down even when -w is supplied

Closes #1281

See merge request openlp/openlp!552
 2023-01-17 23:16:48 +00:00
Raoul Snyman db3d5d2036 Merge branch 'issue-1278' into 'master' 
Fix white preview display when previewing presentations

Closes #1278

See merge request openlp/openlp!551
 2023-01-17 23:16:34 +00:00
Raoul Snyman 6ac288deeb Fix white preview display when previewing presentations 2023-01-17 23:16:34 +00:00
Raoul Snyman fad0b22f2e Fix an issue where the websockets server would try to shut down even when -w is supplied 2023-01-16 22:53:59 -07:00
Raoul Snyman a7d46a3a01 Merge branch 'move-not-link-servicefile' into 'master' 
Use a simpler approach when creating a tmp file when saving service files

See merge request openlp/openlp!550
 2023-01-15 22:40:53 +00:00
Tomas Groth 3f68c156d0 Use a simpler approach when creating a tmp file when saving service files 2023-01-15 22:40:53 +00:00
Raoul Snyman c6f077af33 Merge branch 'release-3.0.1' into 'master' 
Release version 3.0.1

See merge request openlp/openlp!548
 2023-01-13 17:41:15 +00:00
Raoul Snyman 60f08b8348 Release version 3.0.1 2023-01-12 21:00:53 -07:00
Raoul Snyman bfdf392654 Merge branch 'translations-12012023' into 'master' 
Translations 12012023 - and force windows and mac builds (i hope)

See merge request openlp/openlp!547
 2023-01-13 03:55:03 +00:00
Tim Bentley e7b0fd71fe Translations 12012023 - and force windows and mac builds (i hope) 2023-01-13 03:55:03 +00:00
Raoul Snyman 4f12a3232e Merge branch 'fix-some-tests' into 'master' 
Try to fix some tests that are failing in AppVeyor on macOS

See merge request openlp/openlp!546
 2023-01-12 14:15:13 +00:00
Raoul Snyman 137c04933f
Try to fix some tests that are failing in AppVeyor on macOS 2023-01-11 17:11:10 -07:00
Raoul Snyman 2b5fd98bac Merge branch 'test-sorting-num-prefix' into 'master' 
Add a naturel sorting test

See merge request openlp/openlp!545
 2023-01-11 21:26:50 +00:00
Tomas Groth 3a200957e8 Add a naturel sorting test 2023-01-11 21:26:50 +00:00
Raoul Snyman 30b9efd4f0 Merge branch 'Remote2' into 'master' 
Consolidate Remote APIs

See merge request openlp/openlp!537
 2023-01-11 03:07:58 +00:00
Raoul Snyman b6198c9889 Merge branch 'fix-presentation-theme-set' into 'master' 
Fixing theme loading of presentations

Closes #1279

See merge request openlp/openlp!544
 2023-01-11 03:07:34 +00:00
Mateus Meyer Jiacomelli 09009107e6 Fixing theme loading of presentations 2023-01-11 03:07:34 +00:00
Raoul Snyman 3498de7642 Merge branch 'vlc_cleanup2' into 'master' 
Vlc cleanup2

See merge request openlp/openlp!539
 2023-01-11 03:06:39 +00:00
Tim Bentley 0dc5fe2179 Vlc cleanup2 2023-01-11 03:06:38 +00:00