|
a1ab6e26e7
|
Merge branch 'fix-save-service' into 'master'
Fix up the saving of images
See merge request openlp/openlp!452
|
2022-04-19 15:04:17 +00:00 |
|
|
ac4ff452d0
|
Fix up the saving of images
|
2022-04-19 15:04:15 +00:00 |
|
Tim Bentley
|
9be02daa3c
|
Merge branch 'issue-967-sqlalchemy-argument-error' into 'master'
Fix some bugs in Bibles and PresentationManager
Closes #967
See merge request openlp/openlp!451
|
2022-04-09 08:00:35 +00:00 |
|
|
3390323d4f
|
Fix some bugs in Bibles and PresentationManager
|
2022-04-09 08:00:35 +00:00 |
|
|
0269de5d2f
|
Merge branch 'fix-issues-1045-1043' into 'master'
A couple of bug fixes:
See merge request openlp/openlp!444
|
2022-04-08 16:26:51 +00:00 |
|
|
eac00dab37
|
A couple of bug fixes:
|
2022-04-08 16:26:51 +00:00 |
|
Tim Bentley
|
31410c0550
|
Merge branch 'check_setup' into 'master'
update setup() long_description/extras_require
See merge request openlp/openlp!449
|
2022-04-08 07:03:46 +00:00 |
|
|
e9a54821d6
|
update setup() long_description/extras_require
|
2022-04-08 07:03:46 +00:00 |
|
Tim Bentley
|
ee2411eec4
|
Merge branch 'xmlparser_encoding' into 'master'
make presentationmanager parsing more error resilient
Closes #1023
See merge request openlp/openlp!450
|
2022-04-08 07:03:18 +00:00 |
|
Joel Beckmeyer
|
11d35e8a6e
|
make presentationmanager parsing more error resilient
|
2022-04-07 21:44:49 -04:00 |
|
Tim Bentley
|
23b58620ca
|
Merge branch 'image-group-to-folder-icon' into 'master'
Change the icons from groups to folders in the Images plugin, as per requests in the forums
See merge request openlp/openlp!448
|
2022-04-02 09:54:52 +00:00 |
|
|
90ea160eaa
|
Change the icons from groups to folders in the Images plugin, as per requests in the forums
|
2022-04-01 14:08:07 -07:00 |
|
|
89a206c3ce
|
Merge branch 'check_dependancies' into 'master'
Add missing dependencies
See merge request openlp/openlp!447
|
2022-04-01 18:50:25 +00:00 |
|
Tim Bentley
|
d2bfac0628
|
Add missing dependencies
|
2022-04-01 18:50:25 +00:00 |
|
Tim Bentley
|
9a7dae38ca
|
Merge branch 'dep-checks' into 'master'
Update scripts/check_dependencies.py info
See merge request openlp/openlp!446
|
2022-04-01 06:45:42 +00:00 |
|
|
7e4ab873de
|
Update scripts/check_dependencies.py info
|
2022-04-01 06:45:41 +00:00 |
|
|
3a60ccc9bc
|
Merge branch 'issue-1019-handle-file-permission-error' into 'master'
Handle PermissionError nicely
Closes #1019
See merge request openlp/openlp!445
|
2022-03-31 14:52:18 +00:00 |
|
|
ab6d1e87f9
|
Handle PermissionError nicely
|
2022-03-31 14:52:18 +00:00 |
|
|
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 |
|
|
0836d26bdc
|
projector.editform refactoring and tests
|
2022-03-29 18:29:12 +00:00 |
|
Tomas Groth
|
3347e651aa
|
Merge branch 'pjlink_issue_1033' into 'master'
Fix issue #1033
Closes #1033
See merge request openlp/openlp!443
|
2022-03-23 20:54:41 +00:00 |
|
|
f662c63155
|
Fix issue #1033
|
2022-03-23 20:54:40 +00:00 |
|
|
5070451b6c
|
Merge branch 'db-filter-list-update' into 'master'
Update core.db.Manager and projector.db.ProjectorDB
See merge request openlp/openlp!439
|
2022-03-16 15:37:20 +00:00 |
|
|
6f1c9ce891
|
Update core.db.Manager and projector.db.ProjectorDB
|
2022-03-16 15:37:20 +00:00 |
|
|
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 |
|
|
7ab73a75a9
|
commands-tests updates/refactoring 2022-03-02
|
2022-03-16 14:06:37 +00:00 |
|
Tim Bentley
|
67f682cdfd
|
Merge branch 'fix-twice-modal' into 'master'
Avoiding screen setup changed modals twice+ on fast screen changes
See merge request openlp/openlp!438
|
2022-03-03 07:59:39 +00:00 |
|
Mateus Meyer Jiacomelli
|
46238be058
|
Avoiding screen setup changed modals twice+ on fast screen changes
|
2022-03-02 18:02:40 -03:00 |
|
Tim Bentley
|
36c7c647b0
|
Merge branch 'blank-to-theme-issues' into 'master'
Blank to theme issues with video backgrounds
See merge request openlp/openlp!422
|
2022-03-02 14:08:05 +00:00 |
|
|
541bc1508d
|
Blank to theme issues with video backgrounds
|
2022-03-02 14:08:02 +00:00 |
|
|
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 |
|
|
f15b46ebaf
|
Move helper classes from resources to helpers
|
2022-03-01 19:22:36 +00:00 |
|
|
2ec1520c3f
|
Merge branch 'issue-784' into 'master'
Issue 784 - Fix up preview panel code which has memory failure
Closes #784
See merge request openlp/openlp!436
|
2022-03-01 19:21:27 +00:00 |
|
Tim Bentley
|
5e5c771140
|
Issue 784 - Fix up preview panel code which has memory failure
|
2022-03-01 19:21:27 +00:00 |
|
|
801e593131
|
Merge branch 'manager-tests' into 'master'
ProjectorManager tests and refactoring 2022-02-27
See merge request openlp/openlp!431
|
2022-03-01 15:52:29 +00:00 |
|
|
f7a28e5754
|
ProjectorManager tests and refactoring 2022-02-27
|
2022-03-01 15:52:28 +00:00 |
|
Tim Bentley
|
e4f0dc6557
|
Merge branch 'update-appveyor-macos' into 'master'
Use macOS Catalina instead of Mojave in AppVeyor
See merge request openlp/openlp!434
|
2022-03-01 15:06:22 +00:00 |
|
|
c11caa6850
|
Use macOS Catalina instead of Mojave in AppVeyor
|
2022-03-01 07:52:15 -07: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 |
|
Mateus Meyer Jiacomelli
|
526a46d002
|
Adjusting display transitions that causes content flashes
|
2022-03-01 08:04:27 +00:00 |
|
Tim Bentley
|
52b5843d5d
|
Merge branch 'use-old-style-text-outline' into 'master'
Switch to using the old way of making text outlines
Closes #1016
See merge request openlp/openlp!432
|
2022-03-01 07:49:44 +00:00 |
|
|
fe0f2e5a20
|
Switch to using the old way of making text outlines
|
2022-03-01 07:49:44 +00:00 |
|
|
290252ce51
|
Merge branch 'websocket-poll-by-events' into 'master'
Make Websocket Server and Poller to notify state change based on events
See merge request openlp/openlp!340
|
2022-03-01 06:06:39 +00:00 |
|
Mateus Meyer Jiacomelli
|
b4048e0d52
|
Make Websocket Server and Poller to notify state change based on events
|
2022-03-01 06:06:38 +00:00 |
|
Tomas Groth
|
f988c6bb9c
|
Merge branch 'issue-886-confirm-delete-from-service' into 'master'
Confirm deleting item from service
Closes #886
See merge request openlp/openlp!427
|
2022-02-24 22:03:25 +00:00 |
|
Edward Birchall
|
66032f854a
|
Confirm deleting item from service
|
2022-02-24 22:03:25 +00:00 |
|
Tim Bentley
|
6ee7c33805
|
Merge branch 'projector-manager-tests' into 'master'
refactor tests for projector manager 2022-02-21
See merge request openlp/openlp!420
|
2022-02-24 19:04:00 +00:00 |
|
|
5e1716d5cd
|
refactor tests for projector manager 2022-02-21
|
2022-02-24 19:04:00 +00:00 |
|
Tim Bentley
|
0889f95cdf
|
Merge branch 'tabui-tests' into 'master'
Tests for ProjectorTab 2022-02-23
See merge request openlp/openlp!428
|
2022-02-24 19:03:01 +00:00 |
|
|
cb46dd12c2
|
Tests for ProjectorTab 2022-02-23
|
2022-02-24 19:03:01 +00:00 |
|