raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,178 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

12681 Commits

Author SHA1 Message Date
robbie jackson 8e1ff6e0d6 Correction of previous fix for setting slide numbers in footers 2021-11-26 22:08:03 +00:00
Tim Bentley d5876fc576 Merge branch 'check-end-html-instead-of-end-tag' into 'master' 
Check 'end html' instead of 'end tag'

See merge request openlp/openlp!363
 2021-11-10 17:35:26 +00:00
Tim Bentley c6be2ac31d Merge branch 'clean-up-alerts-plugin' into 'master' 
clean up alertsmanager

See merge request openlp/openlp!369
 2021-11-07 07:43:20 +00:00
robbie jackson aff97c0e27 Fix song flash 2021-11-07 00:52:53 +00:00
Andreas P cbfcbae498 remove not reachable code 2021-10-23 16:14:16 +02:00
Andreas P 2c8dd847c0 don't shadow build-in 2021-10-23 16:14:15 +02:00
Andreas P 25952c8751 use f-strings and correct log message, as the icon is shaddowed 2021-10-23 15:48:48 +02:00
Andreas P ddcc7dbd4f clean up alertsmanager 
- the alertsmanager does not manage the alerts anymore, they are managed by the display
- thus the list of alerts is not needed, the id is not needed, also the
  timer id is not needed
- live_display_active is not needed anymore
- there is no point in using the status message
 2021-10-23 15:29:33 +02:00
Raoul Snyman fca5052b24
Fix loading the previous service as a str instead of a Path 
- Fixes #839
- Wrote a whole bunch of tests
 2021-09-16 16:59:03 -07:00
Tim Bentley 191e8dc672 Merge branch 'fix-dvd-media-crash' into 'master' 
Fix dvd media crash

Closes #876

See merge request openlp/openlp!356
 2021-09-12 08:28:58 +00:00
robbie jackson 2eef92fe4a Fix dvd media crash 2021-09-12 08:28:58 +00:00
Tim Bentley df0163b144 Merge branch 'fix-show-presentation-after-media' into 'master' 
Fix of problem showing presentations after media items

Closes #833

See merge request openlp/openlp!362
 2021-09-12 08:28:37 +00:00
STEPHANVS 14c0c93463
Check 'end html' instead of 'end tag' 2021-09-10 23:49:55 +02:00
robbiejackson fee77506f6 code fix done and tests updated 2021-09-10 21:10:49 +01:00
Raoul Snyman b37fd8faca Fix #896 and write tests for the form 2021-09-07 22:00:11 -07:00
Raoul Snyman acc54ce13b
A further and more extensive fix to the fix in !359 2021-09-06 14:44:44 -07:00
Raoul Snyman bd6dfb43be
Fix #912 by using the correct argument; Also fix the tests on macOS (and now my machine) where some version of libxml2 has an error that causes syntax errors in the resulting XML 2021-09-05 22:42:21 -07:00
Mateus Meyer Jiacomelli 34cfe9b8cd Fix dark theme tooltip text color 2021-09-05 07:19:44 +00:00
Raoul Snyman a232346e4a Release 2.9.3 2021-09-02 07:32:59 -07:00
Tim Bentley a3ff2b1d0b Merge branch 'fix-songbook-merge' into 'master' 
Fix merging of song books

Closes #899

See merge request openlp/openlp!347
 2021-09-02 06:46:10 +00:00
robbie jackson 80a70d5b63 Fix merging of song books 2021-09-02 06:46:09 +00:00
Raoul Snyman 10f325d1dd
Fix #881 by setting changing the 'replace' argument to be the position of the item to be replaced 2021-09-01 22:35:11 -07:00
Mateus Meyer Jiacomelli 368c1aa69a Better Dark Mode and UI Theme Support 2021-09-01 18:34:06 +00:00
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
robbie jackson c44d261a0e Fix cd media crash 2021-08-28 07:04:15 +00:00
Raoul Snyman 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
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
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
Raoul Snyman 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
Scott Western 0eb4e4b99e Use CSS standard gradients 2021-07-21 20:44:41 +00:00
STEPHANVS 7bbc7ab05f
Merge branch 'master' of https://gitlab.com/istvanmate/openlp 2021-06-18 23:45:56 +02: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
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
Raoul Snyman 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
Raoul Snyman 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
Daniel Martin b5b510b2ed More fixes 2021-04-25 05:15:37 +00:00
Raoul Snyman 5caca527e1 Merge branch 'confirmation-form' into 'master' 
Confirmation form

Closes #675

See merge request openlp/openlp!313
 2021-04-15 17:33:10 +00:00
robbie jackson d7fe052afc Confirmation form 2021-04-15 17:33:10 +00:00
robbiejackson 5b531b2900 sets PresenterScreen for openoffice if EnablePresenterScreen fails 2021-04-07 21:24:51 +01:00
Daniel Martin 99190ebe56 Fix data directory copy fail 2021-04-03 15:56:47 +00:00
Daniel Martin 8ee657bc8f Add api data for bibles 
Including version, copyright and permissions for primary and secondary bible.
 2021-03-29 20:29:36 +00:00
Tim Bentley ed3608bf47 Merge branch 'fix-impress-display' into 'master' 
Fix impress display

Closes #30

See merge request openlp/openlp!309
 2021-03-26 22:02:32 +00:00
Tomas Groth 8ef650b6cb Update database_exists method. maybe it will support multiple versions. 2021-03-26 21:21:42 +00:00
robbiejackson 0fa973d485 revert to using EnablePresenterScreen as property name 2021-03-22 09:09:55 +00:00
Tim Bentley a9c3372dfa Merge branch 'fix-ccli-notification' into 'master' 
changed CCLI no access notification to be in message area

See merge request openlp/openlp!305
 2021-03-10 17:42:17 +00:00
Tomas Groth cc07ab572c Merge branch 'fix-preview-pause-play' into 'master' 
Fix preview video restart after pause or stop

See merge request openlp/openlp!306
 2021-03-08 21:16:42 +00:00
Tomas Groth 819353b897 Merge branch 'icon-for-audio-files' into 'master' 
changed so audio files are correctly identified

See merge request openlp/openlp!307
 2021-03-08 21:15:45 +00:00
Daniel Martin 7d71b70d62 Fix reset footer template 2021-03-08 21:14:49 +00:00
robbiejackson 60dafd80c0 remove unnecessary variable 2021-03-08 21:00:37 +00:00
robbiejackson 48f91bcd30 added tests for settings presentation tab 2021-03-05 20:51:02 +00:00
robbiejackson 4e88c975ed code changes implemented 2021-03-05 10:19:16 +00:00
robbiejackson 9268194ca0 search changed so audio files are correctly identified 2021-02-23 22:07:00 +00:00
robbiejackson 9e0294024b fix preview video restart after pause or stop 2021-02-21 21:17:57 +00:00
Tomas Groth 8123f9d920 Merge branch 'fix-setting-custom-geometry' into 'master' 
Fix setting custom geometry

See merge request openlp/openlp!304
 2021-02-20 21:32:16 +00:00
robbie jackson febf2615b5 Fix setting custom geometry 2021-02-20 21:32:16 +00:00
robbiejackson b76045e783 changed CCLI no access notification to be in message area 2021-02-18 10:34:32 +00:00
Tim Bentley ed8da9512b Merge branch 'no-access-ccli' into 'master' 
fix for CCLI song select when the user's account has no access to the song

See merge request openlp/openlp!299
 2021-02-17 07:33:38 +00:00
robbie jackson 5ed56e388a fix for CCLI song select when the user's account has no access to the song 2021-02-17 07:33:37 +00:00
Tomas Groth 520362a469 A few beta1 fixes 2021-02-10 07:51:16 +00:00
Tim Bentley b0d8d6fd85 Merge branch 'Allow-sub-directories-in-custom-stages' into 'master' 
Allow sub directories in custom stages

Closes #759

See merge request openlp/openlp!298
 2021-02-06 15:48:39 +00:00
Daniel Martin a327b70dc5 Fix missing image service load crash 2021-02-06 15:48:08 +00:00
Daniel aeac690c4e Allow sub directories in custom stages 2021-02-04 09:56:52 +13:00
Daniel Martin 058bea7f4c Small fixes 2021-02-02 09:28:20 +00:00
Tomas Groth ec6015c7fb Merge branch 'standardize_plugin_search_options' into 'master' 
Standardize plugin search options

Closes #737

See merge request openlp/openlp!296
 2021-01-30 22:36:58 +00:00
Daniel Martin d47a14a716 Standardize plugin search options 2021-01-30 22:36:58 +00:00
Raoul Snyman 44901c4cf5 Merge branch 'Image_DragAndDrop' into 'master' 
Fix bug #730 and #751 where DND images are loaded twice.

See merge request openlp/openlp!292
 2021-01-30 06:03:05 +00:00
Raoul Snyman d465e692cd Merge branch 'master' into 'master' 
Fix chapter count for Zechariah

See merge request openlp/openlp!291
 2021-01-30 06:02:21 +00:00
Raoul Snyman 87bef4f934 Merge branch 'fix_songselect_non_english' into 'master' 
Fix songselect for non english

Closes #752 and #723

See merge request openlp/openlp!293
 2021-01-30 06:01:42 +00:00
Daniel Martin 81dc52110d Change song lyrics selector to fetch link via class name 
And get copyrights via lyrics page where the list has a class name
 2021-01-30 06:01:42 +00:00
Raoul Snyman 9975ad4e43 Merge branch 'fix_auto_unblank' into 'master' 
Fix auto unblank

Closes #729 and #181

See merge request openlp/openlp!294
 2021-01-30 05:59:57 +00:00
Daniel Martin ed129b8923 Fix auto unblank 2021-01-30 05:59:56 +00:00
Daniel Martin 837b62ce39 Make images fullscreen 2021-01-30 05:02:57 +00:00
Tim 7c57f1168d
Fix bug #730 and #751 where DND images are loaded twice. 2021-01-28 14:01:09 +00:00
Sean DeArras 8e9150ba2a Fix chapter count for Zechariah 2021-01-24 13:56:17 -08:00
Tomas Groth 282a845a10 Fixes for the bible plugin. Fix placement of alternative_book_names.sqlite for portable installs. Fix gui elements not updating when only one bible is available. 2021-01-21 07:59:34 +00:00
Tim e682f39fe6
Fix bug #740 where plugin is not loaded. 2021-01-18 15:44:43 +00:00
Daniel Martin da31226029 Fix http poll routes 2021-01-08 15:01:53 +00:00
Tomas Groth 9194273341 Merge branch 'enable_qt_dpi_scaling' into 'master' 
Enable QT DPI scaling

See merge request openlp/openlp!287
 2021-01-03 17:37:20 +00:00
Tomas Groth 561745166a Merge branch 'fix_#713' into 'master' 
Fix #713 - Bible Combo Crash

Closes #713

See merge request openlp/openlp!284
 2021-01-03 17:34:39 +00:00