Tomas Groth
54ad7496cd
Merge branch 'display-mode-toggle' into 'master'
...
Display mode toggle
Closes #905
See merge request openlp/openlp!348
2021-08-28 20:36:54 +00:00
Daniel Martin
744e141dbd
Display mode toggle
2021-08-28 20:36:53 +00:00
Tim Bentley
690062b56b
Merge branch 'fix-cd-media-crash' into 'master'
...
Fix cd media crash
Closes #838
See merge request openlp/openlp!338
2021-08-28 07:04:16 +00:00
robbie jackson
c44d261a0e
Fix cd media crash
2021-08-28 07:04:15 +00:00
Tim Bentley
53caa1aa07
Merge branch 'issue-224-add-folders-to-media' into 'master'
...
Add support for folders to plugins
Closes #582 , #224 , #223 , and #165
See merge request openlp/openlp!327
2021-08-26 20:51:54 +00:00
4d3ade20c7
Add support for folders to plugins
...
- Make a derivative MediaManagerItem class for generic folder support
- Make add and choose folder dialogs based on image plugin dialogs
- Implement folder and item mixins to get db models "for free"
- Implement database layer for media plugin
- Implement database layer for presentations plugins
- Refactor media plugin to inherit from FolderLibraryItem
- Refactor presentations plugin to inherit from FolderLibraryItem
- Migrate media files from settings to database
- Migrate presentations files from settings to database
- Convert the load icons in the media plugin into a dropdown
- Add new tests for MediaMediaItem.get_list()
- Closes #165
- Closes #223
- Closes #224
- Closes #582
2021-08-25 22:51:43 -07:00
Tim Bentley
b5a5cf82c4
Merge branch 'improve-help' into 'master'
...
Improve help
Closes #777
See merge request openlp/openlp!344
2021-08-25 21:14:19 +00:00
robbie jackson
2907cb4f14
Improve help
2021-08-25 21:14:19 +00:00
Tim Bentley
c9da389b4d
Merge branch 'webserver-mimetype-support' into 'master'
...
Webserver mimetype support
See merge request openlp/openlp!346
2021-08-25 19:28:15 +00:00
István Máté
58800cf4be
Webserver mimetype support
2021-08-25 19:28:15 +00:00
Tim Bentley
b10fd605b7
Merge branch 'alert-fix' into 'master'
...
Alert scroll missing text + default font mismatch fix
See merge request openlp/openlp!336
2021-08-19 16:30:49 +00:00
Mateus Meyer Jiacomelli
7d0990021d
Alert scroll missing text + default font mismatch fix
2021-08-19 16:30:49 +00:00
Tim Bentley
0e4055664c
Merge branch 'issue-711-screen-geometry' into 'master'
...
Fix logic in get_screen_number to be more fault tolerant
Closes #711
See merge request openlp/openlp!342
2021-08-19 16:29:58 +00:00
Tim Bentley
73bb4690b9
Merge branch 'add-new-service-message' into 'master'
...
Output message box when a user clicks on New Service when there's already a blank service there.
Closes #777
See merge request openlp/openlp!345
2021-08-19 16:25:02 +00:00
Tim Bentley
2312ff644f
Merge branch 'fix-main-window-positioning' into 'master'
...
Fix main window positioning
Closes #883
See merge request openlp/openlp!343
2021-08-19 16:23:57 +00:00
robbie jackson
aee5d5b495
Fix main window positioning
2021-08-19 16:23:56 +00:00
robbiejackson
cdc1234ebb
code and settings test done
2021-08-18 18:59:29 +01:00
322f4f1d5b
Fix bug #711 and add some tests
2021-08-06 08:24:44 -07:00
Tim Bentley
e048348890
Merge branch 'add-slide-numbers-in-song-footer' into 'master'
...
Add slide numbers in footers
Closes #847
See merge request openlp/openlp!339
2021-07-22 20:48:16 +00:00
robbie jackson
3bbb46cdd3
Add slide numbers in footers
2021-07-22 20:48:15 +00:00
Tim Bentley
ef1bffb0c3
Merge branch 'css-standard-gradients' into 'master'
...
Use CSS standard gradients
See merge request openlp/openlp!337
2021-07-21 20:44:41 +00:00
Scott Western
0eb4e4b99e
Use CSS standard gradients
2021-07-21 20:44:41 +00:00
Tomas Groth
911a3528b7
Merge branch 'test-reselected-theme-stream' into 'master'
...
Test reselected theme stream
See merge request openlp/openlp!334
2021-07-03 18:31:01 +00:00
robbie jackson
ddcfd34ef3
Test reselected theme stream
2021-07-03 18:30:59 +00:00
Tim Bentley
fcb30cb4c1
Merge branch 'fix-sendtolive-service-item-from-remote' into 'master'
...
Fix sending service item to live from remote starts at nth slide
See merge request openlp/openlp!333
2021-06-24 20:46:48 +00:00
STEPHANVS
7bbc7ab05f
Merge branch 'master' of https://gitlab.com/istvanmate/openlp
2021-06-18 23:45:56 +02:00
88f7a805f8
Merge branch 'fix_tests' into 'master'
...
Fix tests (broken on newer versions of pytest-qt)
See merge request openlp/openlp!332
2021-06-18 05:19:44 +00:00
Daniel Martin
00d5570d1d
Fix tests (broken on newer versions of pytest-qt)
2021-06-18 05:19:44 +00:00
Tim Bentley
bb2a3dfdbe
Merge branch 'win-pack-fixes' into 'master'
...
Fix pyinstaller incompabilities by using fixed version of packages
See merge request openlp/openlp!326
2021-06-17 20:56:48 +00:00
Tomas Groth
2ac1598452
Fix pyinstaller incompabilities by using fixed version of packages
2021-06-17 20:56:48 +00:00
Tim Bentley
47e49dd845
Merge branch 'fix-reselected-theme-stream' into 'master'
...
Fix reselected theme stream
Closes #576
See merge request openlp/openlp!330
2021-06-17 20:56:05 +00:00
Tim Bentley
b4570b9ad0
Merge branch 'fix-screen-number-misalignment' into 'master'
...
Fixes associated with Openlp crashing when display screen unplugged
Closes #794
See merge request openlp/openlp!331
2021-06-17 20:55:03 +00:00
robbiejackson
1feeadf3bb
review comments applied
2021-05-26 08:56:20 +01:00
robbiejackson
4ff585a774
fixes applied and some associated tests written
2021-05-21 20:38:35 +01:00
robbiejackson
00b83b5c7d
fix vsize bug
2021-05-13 10:43:55 +01:00
robbiejackson
4f08c25b6b
several bugs relating to theme stream UI fixed
2021-05-13 10:29:29 +01:00
Tomas Groth
0fffbb2f17
Merge branch 'fix-sequential-presentations-2' into 'master'
...
Fix sequential presentations - proper fix
Closes #700
See merge request openlp/openlp!324
2021-04-28 07:10:27 +00:00
robbie jackson
5793526bcb
Fix sequential presentations - proper fix
2021-04-28 07:10:27 +00:00
431c4fe6ee
Merge branch 'fix-printicons' into 'master'
...
Fix Icons in Print when Dark Theme.
See merge request openlp/openlp!325
2021-04-28 06:38:59 +00:00
Tim
ee28fad5b4
Fix Icons in Print when Dark Theme.
...
Fix Test notes following clean up
2021-04-28 07:30:26 +01:00
4d4717a905
Merge branch 'more_media_fixes' into 'master'
...
More media fixes
Closes #665 and #815
See merge request openlp/openlp!323
2021-04-28 06:19:48 +00:00
Daniel Martin
7cc367801a
More media fixes
2021-04-28 06:19:47 +00:00
Tim Bentley
b81d7e753c
Merge branch 'fix_service_save_failure' into 'master'
...
Fix service save failure
Closes #816
See merge request openlp/openlp!322
2021-04-25 06:18:50 +00:00
Daniel Martin
0ab55950a8
Fix service save failure
2021-04-25 06:18:50 +00:00
Tim Bentley
8381adfc36
Merge branch 'fix_websocket_crash' into 'master'
...
Fix websocket crash
Closes #810
See merge request openlp/openlp!315
2021-04-25 06:18:16 +00:00
Daniel Martin
d34e39524a
Fix websocket crash
2021-04-25 06:18:16 +00:00
93a51371ab
Merge branch 'more_fixes' into 'master'
...
More fixes
Closes #818 and #812
See merge request openlp/openlp!320
2021-04-25 05:15:38 +00:00
Daniel Martin
b5b510b2ed
More fixes
2021-04-25 05:15:37 +00:00
5025140141
Merge branch 'test_updates_01' into 'master'
...
Test Migration and Cleanup - 1
See merge request openlp/openlp!318
2021-04-24 16:55:39 +00:00
Tim Bentley
9039fe04f8
Test Migration and Cleanup - 1
2021-04-24 16:55:38 +00:00