|
|
78b2de638a
|
Migrate to 2 style queries
|
2023-05-19 13:55:38 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c897ed8d40
|
Take account of VLC on macOS being bundled with OpenLP
|
2023-05-17 07:25:48 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
3a72f07520
|
Migrate database metadata to declarative base
|
2023-03-14 15:36:19 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
9bd4f85431
|
Migrate Song Usage to declarative
|
2023-03-13 20:13:10 -07:00 |
|
|
|
12bdcb5da4
|
Migrate alerts to declarative
|
2023-03-13 19:38:21 -07:00 |
|
|
|
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 |
|
|
|
aa21ea5cba
|
Fix a typo in creating custom slides from other text items
|
2023-03-13 11:13:36 -07:00 |
|
|
|
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 |
|
|
|
5b40da4d71
|
Merge branch 'migrate-to-declarative-bibles' into 'master'
Convert Bibles to use declarative_base
See merge request openlp/openlp!589
|
2023-03-10 05:53:28 +00:00 |
|
|
|
15de6b1a38
|
Migrate images plugin to declarative base
|
2023-03-09 16:37:43 -07:00 |
|
|
|
dfc53a40f3
|
Convert Bibles to use declarative_base
|
2023-03-09 16:24:53 -07:00 |
|
|
|
efda2c9e53
|
Merge branch 'migrate-to-declarative-custom' into 'master'
Convert custom slides to declarative
See merge request openlp/openlp!588
|
2023-03-09 04:50:41 +00:00 |
|
|
|
ac80e2ed85
|
Convert custom slides to declarative
|
2023-03-07 21:40:48 -07:00 |
|
|
|
ce6c4107b8
|
Merge branch 'migrate-to-declarative-songs' into 'master'
Migrate to using Declarative Base in Songs
See merge request openlp/openlp!586
|
2023-03-08 03:27:49 +00:00 |
|
|
|
b635bad83f
|
Migrate to using Declarative Base in Songs
|
2023-03-08 03:27:49 +00:00 |
|
|
|
411fa39657
|
Merge branch 'improve-ppt-detection' into 'master'
Improve Powerpoint detection by trying to start the application instead of looking it up in the registry.
See merge request openlp/openlp!584
|
2023-03-04 03:50:02 +00:00 |
|
