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

17929 Commits

Author SHA1 Message Date
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
Raoul Snyman 5e036ac608 Merge branch 'move-live-preview-one-line' into 'master' 
Move "Live" / "Preview" and current item on one line

See merge request openlp/openlp!633
 2023-07-18 20:11:10 +00:00
Julian f20ecee0e9 Move "Live" / "Preview" and current item on one line 2023-07-18 20:11:10 +00:00
Raoul Snyman 1affcebb78 Merge branch 'add-copyright-to-powerpraise-importer' into 'master' 
feat(importer): add authors to powerpraise importer

See merge request openlp/openlp!631
 2023-07-18 19:25:47 +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
Tim Bentley de2dde2064 Merge branch 'fix-db-finalize' into 'master' 
Create a connection and then run execute

See merge request openlp/openlp!630
 2023-07-14 15:53:47 +00:00
Raoul Snyman 58076ace93 Create a connection and then run execute 2023-07-14 08:23:16 -07:00
Raoul Snyman 14d3eff0bb Merge branch 'python311-appveyor' into 'master' 
Update appveyor.yml to use python 3.11.

Closes #1563

See merge request openlp/openlp!628
 2023-07-14 15:22:35 +00:00
Tomas Groth f3bbb0527c Update appveyor.yml to use python 3.11. 2023-07-14 15:22:35 +00:00
Tomas Groth 8572f6b321 Merge branch 'fix-with-only-columns' into 'master' 
Fix an issue with the arguments of with_only_columns

See merge request openlp/openlp!629
 2023-07-13 20:34:04 +00:00
Raoul Snyman 4afd01f70e Fix an issue with the arguments of with_only_columns 2023-07-13 12:34:46 -07:00
Tomas Groth 41887bbafb Merge branch 'michaelweghorn/fix_author_search' into 'master' 
Fix song search by author

Closes #1588

See merge request openlp/openlp!627
 2023-07-13 16:43:48 +00:00
Michael Weghorn a442242d9f Fix song search by author 2023-07-13 16:43:48 +00:00
Raoul Snyman 4330610756 Merge branch 'remove-pil' into 'master' 
Remove dependency on PIL since the latest version does not support PyQt5

See merge request openlp/openlp!626
 2023-07-13 14:09:11 +00:00
Tomas Groth b0bf26e530 Remove dependency on PIL since the latest version does not support PyQt5 2023-07-13 14:09:11 +00:00
Tomas Groth 3d21a6acf5 Merge branch 'slidecontroller-screenshot-test-fix' into 'master' 
Fixing freezing screenshot test

See merge request openlp/openlp!625
 2023-06-13 04:30:12 +00:00
Mateus Meyer Jiacomelli 449f1a8a77 Fixing freezing screenshot test 2023-06-09 20:19:05 -03:00
Raoul Snyman 97a3efbc47 Merge branch 'datasoul-transation-fix' into 'master' 
Fix Datasoul translate strings

See merge request openlp/openlp!624
 2023-06-07 18:20:20 +00:00
Mateus Meyer Jiacomelli 72e649dd0d Fix Datasoul translate strings 2023-06-07 13:05:57 -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 545ec3d614 Merge branch 'translations-06062023' into 'master' 
Translations 06062023

See merge request openlp/openlp!623
 2023-06-06 16:17:14 +00:00
Tim Bentley 67fa74a897 Translations 06062023 2023-06-06 16:17:14 +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
Tim Bentley 2d70b6c849 Merge branch 'fix-gitlab-ci' into 'master' 
Fix the GitLab CI yaml config

See merge request openlp/openlp!622
 2023-06-06 15:18:14 +00:00
Raoul Snyman c9e210b62a Fix the GitLab CI yaml config 2023-06-06 07:42:10 -07:00
Raoul Snyman 96dbfa47e5 Merge branch 'issue-1297' into 'master' 
Fix issue #1297 by reducing the number by 1024 times

Closes #1297

See merge request openlp/openlp!621
 2023-06-06 14:40:08 +00:00
Raoul Snyman 3610193072 Merge branch 'fix-resources-for-arm64' into 'master' 
Update resource generation for ARM64 platforms (e.g. Apple M2)

See merge request openlp/openlp!620
 2023-06-06 14:39:48 +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 d330201b2b Update resource generation for ARM64 platforms (e.g. Apple M2) 2023-06-05 16:21:04 -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 375de848f1 Merge branch 'vlc_5_qt6_enum' into 'master' 
Enumm Conversion

See merge request openlp/openlp!619
 2023-06-05 16:57:24 +00:00
Tim Bentley 6600ca150b Enumm Conversion 2023-06-05 16:57:24 +00:00
Raoul Snyman 06da7904ba Merge branch 'vlc_5' into 'master' 
VLC - Cleanup

See merge request openlp/openlp!613
 2023-06-01 04:40:00 +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
Tim Bentley 8187b94855 Merge branch 'fix-issue-914' into 'master' 
Ignore the thumbnails if the path doesn't exist (fixes #914)

Closes #914

See merge request openlp/openlp!617
 2023-05-22 07:00:53 +00: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
Tim Bentley a66153b6bb Merge branch 'fix-415-errors' into 'master' 
Fix the 415 errors due to a change in Werkzeug

See merge request openlp/openlp!615
 2023-05-19 06:49:24 +00:00