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 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
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
Raoul Snyman 873b49bcc6 Merge branch 'issue-1260' into 'master' 
Typecast presentation files from settings to Path

Closes #1260

See merge request openlp/openlp!542
 2023-01-11 03:06:18 +00:00
Raoul Snyman 0636f2554c Typecast presentation files from settings to Path 2023-01-11 03:06:17 +00:00
Tim Bentley 1e43e3e4a4 Merge branch 'issue-1263' into 'master' 
Fix issue #1263 by forcing the CSV file to be UTF-8 encoded

Closes #1263

See merge request openlp/openlp!543
 2023-01-10 08:16:23 +00:00
Tim Bentley 91700700f8 Merge branch 'reintroduce-icu' into 'master' 
First attempt at re-introducing the use of ICU, based on simply reverting the original patch

See merge request openlp/openlp!540
 2023-01-10 08:16:02 +00:00
Tomas Groth fbb6ecd2df First attempt at re-introducing the use of ICU, based on simply reverting the original patch 2023-01-10 08:16:02 +00:00
Raoul Snyman 8ec6b3e863 Fix issue #1263 by forcing the CSV file to be UTF-8 encoded 2023-01-09 19:29:22 -07:00
Mateus Meyer Jiacomelli cee7d5e0f3 Merge branch 'master' into list-view 2023-01-09 18:23:22 -03:00
Mateus Meyer Jiacomelli 6fbeab8f49 Fixing remote version test 2023-01-09 17:56:11 -03:00
Tim Bentley 873f3c9113
Consolidate Remote APIs 2023-01-03 21:12:29 +00:00
Raoul Snyman dbea8bf56b Merge branch 'vlc_cleanup_1' into 'master' 
VLC Cleanup Part 1

See merge request openlp/openlp!531
 2023-01-01 03:49:32 +00:00
Tim Bentley 1020261fa4 VLC Cleanup Part 1 2023-01-01 03:49:31 +00:00
Mateus Meyer Jiacomelli 1da145c6dd Merge branch 'master' into list-view 2022-12-31 15:46:15 -03:00
Tim Bentley 11d9c02579
Happy new Year 2022-12-31 15:54:46 +00:00
Raoul Snyman c0e178c875 Merge branch 'background-media-display-hidden-fix' into 'master' 
Background media display fixes

See merge request openlp/openlp!527
 2022-12-28 21:17:44 +00:00
Mateus Meyer Jiacomelli 96c4062ae3 Background media display fixes 2022-12-28 21:17:44 +00:00
Daniel Martin ca0ce759b4 Fix duplicate data directory 2022-12-28 04:30:16 +00:00
Raoul Snyman 799d9c3918 Fix OpenLyrics import error, and save dialog error 2022-12-19 07:40:45 +00:00
Tim Bentley 8feaa63561 Merge branch 'fix-openlyrics-chord-import' into 'master' 
OpenLyrics importer: Fix whitespaces being 'eaten' when importing a song with chord tags

See merge request openlp/openlp!520
 2022-12-18 07:50:31 +00:00
Mateus Meyer Jiacomelli f36830a272 OpenLyrics importer: Fix whitespaces being 'eaten' when importing a song with chord tags 2022-12-18 07:50:31 +00:00
Tim Bentley f3f7865161 Merge branch 'fix-api-crash-on-backgroud-audio' into 'master' 
Fix api crash on background audio attached

See merge request openlp/openlp!521
 2022-12-18 07:49:35 +00:00
Daniel Martin dc3015bd74 Fix api crash on background audio attached 2022-12-18 07:49:34 +00:00
Raoul Snyman 3f93c1e6b5 Fix an issue where the incorrect path was used for language files 2022-12-18 07:46:56 +00:00
Tim Bentley bd811c2b7a Merge branch 'fix-service-item-context-menu-hot-theme-reload' into 'master' 
Fixing Themes hot reload when using ServiceItem context menu (Song theme level)

See merge request openlp/openlp!518
 2022-12-12 08:04:29 +00:00
Mateus Meyer Jiacomelli 18e3969746 Fixing Themes hot reload when using ServiceItem context menu (Song theme level) 2022-12-12 08:04:28 +00:00
Tim Bentley 6b7ed17c98 Merge branch 'remote-version-fix' into 'master' 
Fixing Web Remote's version.js file handling

See merge request openlp/openlp!517
 2022-12-12 08:04:09 +00:00
Mateus Meyer Jiacomelli 2d7d4aa8a6 Fixing Web Remote's version.js file handling 2022-12-12 08:04:09 +00:00
Mateus Meyer Jiacomelli b1aef9d0fd Fixing OpenLP crash (and increasing performance) caused when using Transpose API Endpoint 2022-12-12 08:03:39 +00:00
Raoul Snyman 332741f9b7 Merge branch 'remove-form-tags-from-chords' into 'master' 
Remove formatting tags from lyrics used for chord stage view

See merge request openlp/openlp!511
 2022-11-30 14:38:10 +00:00
Raoul Snyman a9df04b796 Merge branch 'issue-1187' into 'master' 
Handle different versions of pymediainfo

Closes #1187

See merge request openlp/openlp!512
 2022-11-30 14:37:27 +00:00
Raoul Snyman d5080b0872 Handle different versions of pymediainfo, fixes #1187 2022-11-29 16:10:30 -07:00
Tomas Groth 412ebc56e4 Remove formatting tags from lyrics used for chord stage view 2022-11-29 22:03:43 +01:00
Raoul Snyman 75020cdba4 Merge branch 'screen-flicker-fix' into 'master' 
Handling screen display change corner cases

Closes #1212

See merge request openlp/openlp!509
 2022-11-28 18:16:15 +00:00
Mateus Meyer Jiacomelli 0574505ca3 merge 2022-11-26 23:34:34 -03:00
Mateus Meyer Jiacomelli 6ceccf01cb planningcenter test fix due to locale differences 2022-11-23 13:23:21 -03:00
Mateus Meyer Jiacomelli 58a07e5058 Merge branch 'master' into screen-flicker-fix 2022-11-21 11:59:24 -03:00
Mateus Meyer Jiacomelli b9d507b455 fixing tests 2022-11-21 11:46:43 -03:00
Mateus Meyer Jiacomelli 3067175ff5 handling screen display change corner cases 2022-11-19 17:12:30 -03:00
Raoul Snyman d1fc00a462 Handle a corrupted header in WordProject files (fixes #1185) 2022-11-17 13:37:05 -07:00
Raoul Snyman 9f03336898 Fix issue with theme backgrounds disappearing 2022-11-17 17:03:52 +00:00
Raoul Snyman 481b030a5f Silence any errors from the LibreOffice shutdown on macOS, usually due to users closing LibreOffice, fixes #1200 2022-11-14 12:42:42 -07:00
Raoul Snyman 59028a5cc2 Update MR !489 to better detect the encoding of the file being imported. 2022-11-14 19:19:41 +00:00
Mateus Meyer Jiacomelli 0500f3b799 Starting web services later to fix #1210 2022-11-14 16:14:51 +00:00
Tomas Groth 45b2ba4948 Merge branch '1152_reset_display_on_screen_added' into 'master' 
#1152 Reset display when a screen is added.

Closes #1152

See merge request openlp/openlp!500
 2022-10-26 05:21:04 +00:00
AVee1 0446fbe7ef #1152 Reset display when a screen is added. 2022-10-26 05:21:04 +00:00
Daniel Martin 303b409c50 Fix tags on verse split 2022-10-26 04:51:19 +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 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 b69491979e Fix linked audio in the service files, fixes bug #1144. 2022-10-18 17:15:26 +00:00
Raoul Snyman b9158947f0 Add a few tests for service manager 2022-10-07 14:24:07 +00:00
Raoul Snyman 8c94c53d30 Add a property to Book to fix #1181 2022-09-27 22:11:13 -07:00
Mateus Meyer Jiacomelli d09f323426 renaming ambiguous method 2022-09-08 13:38:30 -03:00
Mateus Meyer Jiacomelli 4f1f471147 list view grid tests + horizontal scroll handler on small height 2022-09-08 13:21:39 -03:00
Raoul Snyman 1deb7fa1c5 Add more tests around the EditVerseForm 2022-08-15 23:12:14 -07:00
Raoul Snyman 25a2bbdca1 Fix an attribute error in EditVerseForm 2022-08-15 06:07:05 +00:00
Raoul Snyman 80f0d19393 Fall back on the file name if there is no hash 2022-08-13 13:52:39 -07:00
Raoul Snyman 280fc1b31d Fix up some of the tests on AppVeyor 2022-08-13 20:40:12 +00:00
Tim Bentley 13ab80b13d Remove ZeroConf as not used 2022-08-12 16:03:11 +00: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
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
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
Raoul Snyman d112c94482 Handle a case where an exception is thrown when OpenLP is shutting down (fixes #1005) 2022-07-22 13:38:43 -07:00
Tomas Groth 9cbe84bfff Merge branch 'issue-1020' into 'master' 
Fix "name 'NetworkStreamSelectorForm' is not defined"

Closes #1020

See merge request openlp/openlp!469
 2022-07-22 20:30:55 +00:00
Raoul Snyman 99f9df1540 Fix "name 'NetworkStreamSelectorForm' is not defined" 2022-07-22 20:30:55 +00:00
Raoul Snyman 2f9a16260f Fix bug #1098 by checking that the selectedItem is not None 2022-07-21 16:12:31 -07:00
Raoul Snyman e96e180476 Try to work around issue with missing older ids (fixes #1108) 2022-07-20 22:57:44 -07:00
Raoul Snyman 6a3f4a5686 Work around a permission error 2022-07-16 11:18:00 -07:00
Raoul Snyman 0bd045d7fe Fix the resolve issue on Windows; Refactor the skips in tests to use pytest's built in skip stuff 2022-06-28 11:17:30 -07:00
Raoul Snyman 5aa34f5e9a Skip recent menu items which are None 2022-06-25 20:35:28 +00:00
Raoul Snyman 3b38e5baa8 Try to work around pymediainfo exception 2022-06-21 18:51:57 +00:00
Tim Bentley 9a37f6cc86
Fix the Alerts tests failing and increase coverage 2022-05-28 08:34:37 +01:00
Raoul Snyman 36efab9407 Fix importing ChordPro files with the correct encoding on Windows 2022-05-20 18:19:13 +00:00
Raoul Snyman 59dde255a4 Merge branch 'issue-878-repaint-service-list' into 'master' 
Attempt to fix #878

Closes #878

See merge request openlp/openlp!457
 2022-05-12 14:07:46 +00:00
Raoul Snyman fab9f8d7d8 Attempt to fix #878 2022-05-12 14:07:44 +00:00
Tim Bentley eb6691b4fe Merge branch 'add-whole-verse-continuous-bible-layout-style' into 'master' 
Add "Continuous (whole verses)" bible layout style

See merge request openlp/openlp!454
 2022-05-12 07:07:44 +00:00
STEPHANVS ffaa131d8a
reflect settings change on style_combo_box 2022-05-12 01:13:57 +02:00
Daniel Martin 13269b3977 Future proof downgrades 2022-05-10 21:45:54 +00:00
Raoul Snyman 3390323d4f Fix some bugs in Bibles and PresentationManager 2022-04-09 08:00:35 +00:00
Raoul Snyman eac00dab37 A couple of bug fixes: 2022-04-08 16:26:51 +00:00
Raoul Snyman ab6d1e87f9 Handle PermissionError nicely 2022-03-31 14:52:18 +00:00
Raoul Snyman b6135737e3 Merge branch 'editform-tests' into 'master' 
projector.editform refactoring and tests

See merge request openlp/openlp!441
 2022-03-29 18:29:12 +00:00
Ken Roberts 0836d26bdc projector.editform refactoring and tests 2022-03-29 18:29:12 +00:00
Ken Roberts f662c63155 Fix issue #1033 2022-03-23 20:54:40 +00:00
Ken Roberts 6f1c9ce891 Update core.db.Manager and projector.db.ProjectorDB 2022-03-16 15:37:20 +00:00
Raoul Snyman 38073ea8be Merge branch 'commands-tests' into 'master' 
commands-tests updates/refactoring 2022-03-02

See merge request openlp/openlp!437
 2022-03-16 14:06:39 +00:00
Ken Roberts 7ab73a75a9 commands-tests updates/refactoring 2022-03-02 2022-03-16 14:06:37 +00:00
Mateus Meyer Jiacomelli 46238be058 Avoiding screen setup changed modals twice+ on fast screen changes 2022-03-02 18:02:40 -03:00
Raoul Snyman 07c9007173 Merge branch 'pjlink-helpers' into 'master' 
Move helper classes from resources to helpers

See merge request openlp/openlp!435
 2022-03-01 19:22:36 +00:00
Ken Roberts f15b46ebaf Move helper classes from resources to helpers 2022-03-01 19:22:36 +00:00
Tim Bentley 5e5c771140 Issue 784 - Fix up preview panel code which has memory failure 2022-03-01 19:21:27 +00:00
Ken Roberts f7a28e5754 ProjectorManager tests and refactoring 2022-02-27 2022-03-01 15:52:28 +00:00
Tim Bentley 4c83aa58c1 Merge branch 'previous-verse-flash-fix' into 'master' 
Adjusting display transitions that causes content flashes

Closes #979

See merge request openlp/openlp!429
 2022-03-01 08:04:27 +00:00