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

17935 Commits

Author SHA1 Message Date
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
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
Raoul Snyman 4fe2ba0d31 Merge branch 'mdi-conversion' into 'master' 
Migrate from FontAwesome4 to Material Design Icons v5.9.55

See merge request openlp/openlp!600
 2023-04-18 05:04:38 +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
Tomas Groth e9057bacc5 Merge branch 'translations-loading-linux' into 'master' 
Fix translations loading on linux system-wide installation

See merge request openlp/openlp!599
 2023-04-05 06:34:40 +00:00
Chocimier b34d984e16 Fix translations loading on linux system-wide installation 2023-04-05 06:34:40 +00:00
Tomas Groth 6f935b9a95 Merge branch 'migrate-to-declarative-meta' into 'master' 
Migrate database metadata to declarative base

See merge request openlp/openlp!596
 2023-03-16 16:35:13 +00:00
Raoul Snyman 3a72f07520 Migrate database metadata to declarative base 2023-03-14 15:36:19 -07:00
Raoul Snyman 1fc1bd4124 Merge branch 'migrate-images-to-folder-classes' into 'master' 
Migrate Images plugin to use shared folder code

See merge request openlp/openlp!593
 2023-03-14 22:31:59 +00:00
Raoul Snyman 559235a59c Merge branch 'migrate-to-declarative-alerts' into 'master' 
Migrate alerts to declarative

See merge request openlp/openlp!594
 2023-03-14 16:55:37 +00:00
Raoul Snyman 20b4102c77 Merge branch 'migrate-to-declarative-songusage' into 'master' 
Migrate Song Usage to declarative

See merge request openlp/openlp!595
 2023-03-14 13:36:45 +00:00
Raoul Snyman 9bd4f85431 Migrate Song Usage to declarative 2023-03-13 20:13:10 -07:00
Raoul Snyman 12bdcb5da4 Migrate alerts to declarative 2023-03-13 19:38:21 -07:00
Raoul Snyman cc5bea2732 Migrate Images plugin to use shared folder code 2023-03-13 18:57:04 -07:00
Tomas Groth e4d39b58f2 Merge branch 'fix-create-custom-slide' into 'master' 
Fix a typo in creating custom slides from other text items

See merge request openlp/openlp!592
 2023-03-13 20:50:53 +00:00
Raoul Snyman aa21ea5cba Fix a typo in creating custom slides from other text items 2023-03-13 11:13:36 -07:00
Raoul Snyman af2c9a492c Merge branch 'migrate-to-declarative-images' into 'master' 
Migrate images plugin to declarative base

See merge request openlp/openlp!590
 2023-03-10 07:24:10 +00:00