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

17904 Commits

Author SHA1 Message Date
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
Raoul Snyman 5619c42c1f Fix the 415 errors due to a change in Werkzeug 2023-05-18 13:59:25 -07:00
Raoul Snyman eb26def111 Merge branch 'use-gitlab-container-registry' into 'master' 
Update CI to use the GitLab container registry

See merge request openlp/openlp!614
 2023-05-18 20:48:41 +00:00
Raoul Snyman e1865fd19f Update CI to use the GitLab container registry 2023-05-18 11:27:33 -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 376116329a Merge branch 'icon-oops' into 'master' 
Fix bug in icon definition - Typr only

Closes #1500

See merge request openlp/openlp!612
 2023-05-17 16:05:31 +00:00
Tim Bentley f3bdb128be Fix bug in icon definition - Typr only 2023-05-17 16:05:31 +00:00
Tim Bentley 57916a9d0a Merge branch 'fix-vlc-bundling-macos' into 'master' 
Take account of VLC on macOS being bundled with OpenLP

See merge request openlp/openlp!591
 2023-05-17 07:25:48 +00:00
Raoul Snyman c897ed8d40 Take account of VLC on macOS being bundled with OpenLP 2023-05-17 07:25:48 +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
Raoul Snyman 3efd0b009d Merge branch 'issue-1323' into 'master' 
Fix for #1495 task: wrapped C/C++ object of type QTreeWidgetItem has been deleted

Closes #1495

See merge request openlp/openlp!610
 2023-05-16 16:41:35 +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
Raoul Snyman 4b0f05e79f Merge branch 'fix-images-insertion-error' into 'master' 
Fixing Images not being able to be inserted on Service

Closes #1440

See merge request openlp/openlp!608
 2023-05-11 22:48:02 +00:00
Mateus Meyer Jiacomelli 7c7eb10adc Fixing Images not being able to be inserted on Service 2023-05-11 22:48:01 +00:00
Raoul Snyman e4152ed53d Merge branch 'reusable-media-toolbar' into 'master' 
Reusable Media Toolbar

See merge request openlp/openlp!606
 2023-05-04 20:37:14 +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
Raoul Snyman a87d37a986 Merge branch 'merge-custom-xml' into 'master' 
Merge CustomXMLBuilder and CustomXMLParser

See merge request openlp/openlp!603
 2023-04-20 16:42:11 +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