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

3450 Commits

Author SHA1 Message Date
Raoul Snyman dccf037bd6 Fix a couple of macOS issues 2023-08-19 09:43:20 +00:00
Raoul Snyman 0d7f664626 Merge branch 'issue-1624' into 'master' 
Fix issue #1624

Closes #1624

See merge request openlp/openlp!650
 2023-08-18 21:01:55 +00:00
Raoul Snyman 7b596bd969 Merge branch 'test-coverage-main' into 'master' 
Add test coverage for __main__.py and remove some unused files

See merge request openlp/openlp!645
 2023-08-18 20:26:59 +00:00
Raoul Snyman 72e3394877 Merge branch 'update-last-tests' into 'master' 
Refactor last instances of TestCase-based tests

See merge request openlp/openlp!649
 2023-08-18 20:26:35 +00:00
Raoul Snyman d0d0bb08f9 Fix issue #1624 2023-08-18 13:25:17 -07:00
Raoul Snyman 9c9c7880b9 Make some forward compatibility changes 2023-08-18 19:28:04 +00:00
Raoul Snyman dee8fbb22a Refactor last instances of TestCase-based tests 2023-08-18 11:58:27 -07:00
Tomas Groth ad8dcb0f8a Change SongSelect import procedure to import when clicking download on webpage 2023-08-18 18:03:32 +00:00
Raoul Snyman 586b54c7b8 Add test coverage for __main__.py and remove some unused files 2023-08-18 07:28:39 -07:00
Raoul Snyman dc2476c27f Remove unused flag in Registry 2023-08-18 03:35:55 +00:00
Raoul Snyman 8a31048381 Merge branch 'presentation-blank' into 'master' 
Fix presentations not being able to return from Display Screen

See merge request openlp/openlp!632
 2023-08-13 21:54:00 +00:00
Tomas Groth 35dc55d7f7 Fix presentations not being able to return from Display Screen 2023-08-13 21:54:00 +00:00
Raoul Snyman 8d49dbf042 Merge branch 'issue-1382' into 'master' 
Fix a websockets issue, and an OpenLP internal server issue

Closes #1618 and #1382

See merge request openlp/openlp!643
 2023-08-13 21:49:06 +00:00
Raoul Snyman 4351651ad5 fix the deadlock on macos 2023-08-13 07:40:04 +00:00
Raoul Snyman 62aadcf7b9 Fix issue #1618 by ignoring the messages if the event loop is not running 2023-08-12 15:44:19 -07:00
Raoul Snyman 3593ae22b3 Fix issue #1382 by waiting for the service_manager to become available, or giving up after 2m 2023-08-12 13:53:30 -07:00
Raoul Snyman 32dc18a31f Merge branch 'display-api-abstraction' into 'master' 
Display API abstraction

See merge request openlp/openlp!604
 2023-08-12 15:59:37 +00:00
Mateus Meyer Jiacomelli a04ed99dfc Display API abstraction 2023-08-12 15:59:37 +00:00
Raoul Snyman 1eb8ef5f0d Try to fix an issue with MediaInfo perhaps returning a str instead of an int 2023-08-11 23:31:02 -07:00
Raoul Snyman 8052d29fa8 Merge branch 'async-remote-search' into 'master' 
Fix issue #1582 by running the search in the original thread

Closes #1582

See merge request openlp/openlp!641
 2023-08-11 22:28:25 +00:00
Raoul Snyman f098b07f5e Fix issue #1582 by running the search in the original thread 2023-08-11 12:47:21 -07:00
Raoul Snyman b3acb03051 Try to fix an issue that only seems to happen on macOS 2023-08-10 22:21:01 -07:00
Tomas Groth 27ae8006cc Allow loading the same presentation file multiple times from 2.4.x service file. Fixes bug #1601. 2023-07-28 13:33:34 +02:00
Tim Bentley ceda811e70 Merge branch 'lock-data-dir' into 'master' 
Implement a filelock for shared data folder.

See merge request openlp/openlp!519
 2023-07-19 06:50:21 +00:00
Tomas Groth 73b3568b5b Implement a filelock for shared data folder. 2023-07-19 06:50:21 +00:00
Raoul Snyman d97bc6a9ca Merge branch 'add-songs-to-topics-books-authors' into 'master' 
Add the list of associated songs to the delete dialog in the song maintenance form

See merge request openlp/openlp!635
 2023-07-18 20:13:12 +00:00
Raoul Snyman 11d55e498c Merge branch 'presentation-from-cloud-drive' into 'master' 
Add detection for presentation files that were uploaded from the cloud.

See merge request openlp/openlp!634
 2023-07-18 20:11:52 +00:00
Chris Witterholt f7f701abf2 Add detection for presentation files that were uploaded from the cloud. 2023-07-18 20:11:52 +00:00
Julian f20ecee0e9 Move "Live" / "Preview" and current item on one line 2023-07-18 20:11:10 +00:00
Michael Heiniger f0438d6365 feat(importer): add authors to powerpraise importer 2023-07-18 19:25:47 +00:00
Raoul Snyman 92db0c0cc7 Add the list of associated songs to the delete dialog in the song maintenance form 2023-07-17 15:11:03 -07:00
Raoul Snyman 58076ace93 Create a connection and then run execute 2023-07-14 08:23:16 -07:00
Tomas Groth f3bbb0527c Update appveyor.yml to use python 3.11. 2023-07-14 15:22:35 +00:00
Michael Weghorn a442242d9f Fix song search by author 2023-07-13 16:43:48 +00:00
Mateus Meyer Jiacomelli 449f1a8a77 Fixing freezing screenshot test 2023-06-09 20:19:05 -03:00
Tomas Groth 4f7a2338e6 Merge branch 'wayland-display-window-screenshot' into 'master' 
RFC/Proposal: Fallback code for display screenshot code (used on '/main'  Web Remote)

Closes #1284 and #1405

See merge request openlp/openlp!582
 2023-06-06 20:05:55 +00:00
Mateus Meyer Jiacomelli 003ebaafaa RFC/Proposal: Fallback code for display screenshot code (used on '/main' Web Remote) 2023-06-06 20:05:55 +00:00
Tim Bentley 72ac7dfd5e Merge branch 'new-theme-controls' into 'master' 
New theme adjustments: Adding letter spacing to theme main area; adding line and letter spacing to footer

See merge request openlp/openlp!611
 2023-06-06 15:47:41 +00:00
Mateus Meyer Jiacomelli 50acb6fb64 New theme adjustments: Adding letter spacing to theme main area; adding line and letter spacing to footer 2023-06-06 15:47:40 +00:00
Raoul Snyman 029d630a53 Fix issue #1297 by reducing the number by 1024 times 2023-06-05 21:42:44 -07:00
Raoul Snyman 3e509ec001 Merge branch 'upgrade-to-pyro5' into 'master' 
Upgrade to Pyro5

Closes #1309

See merge request openlp/openlp!618
 2023-06-05 22:30:37 +00:00
Tim Bentley 6600ca150b Enumm Conversion 2023-06-05 16:57:24 +00:00
Tim Bentley d03e7966d0 VLC - Cleanup 2023-06-01 04:40:00 +00:00
Raoul Snyman f59146b505 Upgrade to Pyro5 2023-05-22 21:34:03 -07:00
Raoul Snyman 8e0735d267 Ignore the thumbnails if the path doesn't exist (fixes #914) 2023-05-21 22:17:55 -07:00
Raoul Snyman d27cca72aa Merge branch 'issue-1356' into 'master' 
Fix an issue where an item's parent is None

Closes #1365

See merge request openlp/openlp!616
 2023-05-20 14:33:09 +00:00
Raoul Snyman 183724cc08 Merge branch 'footer-song-first-slide' into 'master' 
Adding Footer Content as Extra First Slide

See merge request openlp/openlp!523
 2023-05-20 14:31:59 +00:00
Mateus Meyer Jiacomelli d9911790d4 Adding Footer Content as Extra First Slide 2023-05-20 14:31:59 +00:00
Raoul Snyman 12775b8172 Fix an issue where an item's parent is None 2023-05-19 21:29:45 -07:00
Raoul Snyman c0d3f7c759 Merge branch 'migrate-to-2-style-queries' into 'master' 
Migrate to 2 style queries

See merge request openlp/openlp!597
 2023-05-19 13:55:38 +00:00
Raoul Snyman 78b2de638a Migrate to 2 style queries 2023-05-19 13:55:38 +00:00
Raoul Snyman 5619c42c1f Fix the 415 errors due to a change in Werkzeug 2023-05-18 13:59:25 -07:00
Raoul Snyman f40ffd377f Merge branch 'display-custom-scheme' into 'master' 
Display Custom Scheme

See merge request openlp/openlp!605
 2023-05-18 05:08:43 +00:00
Mateus Meyer Jiacomelli 69d20d8fa2 Display Custom Scheme 2023-05-18 05:08:43 +00:00
Raoul Snyman 0c137a304b Merge branch 'message-based-websockets-endpoint' into 'master' 
Implementing new message websocket endpoint

See merge request openlp/openlp!609
 2023-05-18 05:08:20 +00:00
Mateus Meyer Jiacomelli 215ee5863d Implementing new message websocket endpoint 2023-05-18 05:08:20 +00:00
Raoul Snyman 2427ae10a8 Merge branch 'vlc_5' into 'master' 
VLC - Cleanup

See merge request openlp/openlp!607
 2023-05-16 16:50:13 +00:00
Tim Bentley 8b7d03fed0 VLC - Cleanup 2023-05-16 16:50:12 +00:00
Mateus Meyer Jiacomelli 34e74632c2 Fix for #1495 task: wrapped C/C++ object of type QTreeWidgetItem has been deleted 2023-05-16 16:41:34 +00:00
Mateus Meyer Jiacomelli af57504498 Reusable Media Toolbar 2023-05-04 20:37:14 +00:00
Tomas Groth 9e34f9eca1 Merge branch 'footer-per-slide' into 'master' 
Adding foundational support to Footer per slide

See merge request openlp/openlp!576
 2023-04-20 18:52:39 +00:00
Mateus Meyer Jiacomelli 4615eb5b7b Adding foundational support to Footer per slide 2023-04-20 18:52:39 +00:00
Tomas Groth 48ee6b9dde Merge CustomXMLBuilder and CustomXMLParser 2023-04-20 16:42:10 +00:00
Raoul Snyman 5e38f30aa6 Merge branch 'datasoul' into 'master' 
Add Datasoul song importer

See merge request openlp/openlp!598
 2023-04-18 05:05:34 +00:00
Bastian Germann ac7ba118f9 Add Datasoul song importer 2023-04-18 05:05:34 +00:00
Raoul Snyman 1348edd118 Merge branch 'feature/fix_tests_on_windows' into 'master' 
fix: tests on windows failing due to MagicMock in Path

See merge request openlp/openlp!602
 2023-04-18 05:05:14 +00:00
Benjamin Hoving 1b2b05ca0f fix: tests on windows failing due to MagicMock in Path 2023-04-18 05:05:14 +00:00
Tomas Groth b23558ed37 Migrate from FontAwesome4 to Material Design Icons v5.9.55 2023-04-18 05:04:38 +00:00
Tomas Groth bc12ee9023 Merge branch 'highlighted-slidecontroller-buttons' into 'master' 
Highlighted slidecontroller buttons

Closes #870

See merge request openlp/openlp!578
 2023-04-05 06:36:48 +00:00
Mateus Meyer Jiacomelli 0d91fb4bf7 Highlighted slidecontroller buttons 2023-04-05 06:36:48 +00:00
Chocimier b34d984e16 Fix translations loading on linux system-wide installation 2023-04-05 06:34:40 +00:00
Raoul Snyman 3a72f07520 Migrate database metadata to declarative base 2023-03-14 15:36:19 -07:00
Raoul Snyman cc5bea2732 Migrate Images plugin to use shared folder code 2023-03-13 18:57:04 -07:00
Raoul Snyman dfc53a40f3 Convert Bibles to use declarative_base 2023-03-09 16:24:53 -07:00
Raoul Snyman b635bad83f Migrate to using Declarative Base in Songs 2023-03-08 03:27:49 +00:00
Tomas Groth 84e8e7dc17 Minor fix for EasyWorship import 2023-02-19 22:30:03 +01:00
Mateus Meyer Jiacomelli 479d224878 Merge branch 'master' into list-view 2023-02-17 11:18:17 -03:00
Raoul Snyman 52110d812a Merge branch 'remove-webob' into 'master' 
Remove WebOb -- we don't need it

See merge request openlp/openlp!569
 2023-02-16 21:04:02 +00:00
Raoul Snyman fd0c51ecd1 Merge branch 'issue-1327' into 'master' 
Skip missing thumbnails when loading a service

Closes #1327

See merge request openlp/openlp!577
 2023-02-16 21:03:31 +00:00
Mateus Meyer Jiacomelli 7c6f2efc81 Fix selected=True not being set at new Transpose API Endpoint 2023-02-16 17:57:34 +00:00
Raoul Snyman f1fe916781 Skip missing thumbnails when loading a service 2023-02-16 09:48:16 -07:00
Mateus Meyer Jiacomelli a22284fd0c Merge branch 'master' into list-view 2023-02-10 22:19:41 -03:00
Raoul Snyman 3a72c9f366 Remove WebOb -- we don't need it 2023-02-08 12:55:02 -07: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
Mateus Meyer Jiacomelli d2cf191d0a Fix OpenLyrics whitespaces being 'eaten' (again) 2023-01-31 17:24:07 +00:00
Tomas Groth eb1c86227a Force the use of SqlAlchemy 1.4 for now 2023-01-29 16:29: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
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 1ee8223d55 Display the closing progress dialog during plugin shutdown 2023-01-18 23:15:11 -07: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 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
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 137c04933f
Try to fix some tests that are failing in AppVeyor on macOS 2023-01-11 17:11:10 -07:00
Tomas Groth 3a200957e8 Add a naturel sorting test 2023-01-11 21:26:50 +00:00
Mateus Meyer Jiacomelli fba1e54f05 Merge branch 'master' into list-view 2023-01-11 11:58:22 -03:00