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

16858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Bentley
bd32b892f2 Merge branch 'fix-crosswalk-bibles' into 'master' 
Fix the CrossWalk Biblestudytools.com importer

See merge request openlp/openlp!241
 2020-09-26 20:05:42 +00:00
Tim Bentley
fef70e4af4 Merge branch 'fix-mediashout-test' into 'master' 
Fix problem with new MediaShout test

See merge request openlp/openlp!239
 2020-09-26 20:04:56 +00:00
Tomas Groth
cc738cca3f Merge branch 'check_depends_fix' into 'master' 
Fix in ./scripts/check_dependencies.py

See merge request openlp/openlp!238
 2020-09-26 19:42:10 +00:00
Raoul Snyman
7734ce89a0
Fix the CrossWalk Biblestudytools.com importer 2020-09-25 23:13:10 -07:00
Raoul Snyman
ed488621aa
Fix problem with new MediaShout test 2020-09-25 21:52:12 -07:00
Martin Zibricky
8786a8cc7a Fix in ./scripts/check_dependencies.py 
- fix pytest-qt import
- replace __import__ with importlib
- fix fitz description
 2020-09-25 16:11:20 +02:00
Tim Bentley
844399b54f Merge branch 'issue-62-rename-song-importer' into 'master' 
Rename OpenLP 2.0 Song Importer

Closes #62

See merge request openlp/openlp!237
 2020-09-24 07:12:25 +00:00
Tim Bentley
db25e78f03 Merge branch 'issue-35-mediashout-traceback' into 'master' 
Fix two bugs in the MediaShout importer

See merge request openlp/openlp!236
 2020-09-24 07:12:14 +00:00
Raoul Snyman
d18faa5233
Hopefully fix some confusion, fixes #62 2020-09-23 19:20:06 -07:00
Raoul Snyman
74a72877d8
Fix two bugs in the MediaShout importer 
- Fix a bug where the "Themes" table was never read due to an incorrect "if" statement
- Fix a bug where the "Groups" table was presumed to exist, but doesn't always (bug #35)
 2020-09-23 15:25:37 -07:00
Tim Bentley
ac161d79ed Merge branch 'sept-2020' into 'master' 
Fixes Sept 2020

Closes #633

See merge request openlp/openlp!231
 2020-09-23 08:37:57 +00:00
Tim Bentley
09b57c3cd7 Stop videos playing if no VLC. 
#633
 2020-09-23 08:37:57 +00:00
Tim Bentley
3c224a9874 Merge branch 'issue-434-fix-wordproject-import' into 'master' 
Fix #434 by handling links with titles

Closes #434

See merge request openlp/openlp!235
 2020-09-23 06:42:20 +00:00
Raoul Snyman
0eadcc535f
Fix #434 by handling links with titles 2020-09-22 22:42:45 -07:00
Raoul Snyman
a1941da34b Merge branch 'beta1_bugfixes_2' into 'master' 
Beta1 bugfixes round 2

Closes #668 and #667

See merge request openlp/openlp!234
 2020-09-23 04:50:09 +00:00
Daniel
b5a2eef4e7 Fix api crash when sending thumbnail path 
For things with thumbnails that aren't images (just presentations I think)
 2020-09-23 04:50:09 +00:00
Tim Bentley
35c56cecdb Merge branch 'bug_fixes' into 'master' 
Bug fixes for beta1

Closes #588, #662, #663, and #664

See merge request openlp/openlp!233
 2020-09-20 17:35:49 +00:00
Daniel
b33d27f77c Fix theme combo box not showing at start 
The theme combo box did not show when the currently rendered item
doesn't support the service/song theme levels.

This changes the theme combo box to use the theme level from the
settings rather than the currently rendered item.
 2020-09-20 17:35:49 +00:00
Raoul Snyman
fdf5cce5f2 Merge branch 'keynote-ppt-mac' into 'master' 
Add support for presentation with Keynote and PowerPoint on Mac

See merge request openlp/openlp!205
 2020-09-13 14:49:02 +00:00
Tomas Groth
cd22bfaa51 Started work on support for powerpoint on mac. Changed the script execution approach from osascript to py-applescript. Not tested. At all. 2020-09-13 14:49:02 +00:00
Tim Bentley
ec9d5b9099 Merge branch 'theme-thumbnails-api' into 'master' 
Theme thumbnails api

See merge request openlp/openlp!227
 2020-08-27 06:19:47 +00:00
Fernando Quant
0a64cc95ec Themes api get_themes returns the preview image instead of the full background image in the theme_list 2020-08-27 06:19:47 +00:00
Tim Bentley
e2a65a3264 Merge branch 'fix-image-db-upgrade' into 'master' 
Fix image db upgrade

Closes #585, #649, and #607

See merge request openlp/openlp!230
 2020-08-18 06:47:02 +00:00
Tomas Groth
04feb3ee67 Fix image db upgrade 2020-08-18 06:47:02 +00:00
Tim Bentley
6711cbee9d Merge branch 'fix-font-file' into 'master' 
Remove the references to FontAwesome, this file does not contain FontAwesome at all

See merge request openlp/openlp!228
 2020-08-15 13:38:32 +00:00
Tomas Groth
8aae8cdece Merge branch 'allow-whitespaces-in-openlyrics-lines-tag' into 'master' 
Allow whitespaces inside <lines>

Closes #550

See merge request openlp/openlp!229
 2020-08-13 19:40:14 +00:00
Gyuris Gellért
7df43c7dfb Add solution to remove extra whitespaces from OL <lines> tag 
Related to #550
 2020-08-13 19:40:14 +00:00
Raoul Snyman
58e2e50610
Remove the references to FontAwesome, this file does not contain FontAwesome at all 2020-08-12 21:48:32 -07:00
Raoul Snyman
a944791a70 Merge branch 'ccli_fix' into 'master' 
Fix CCLI with the QT WebEngine

See merge request openlp/openlp!214
 2020-08-06 02:26:56 +00:00
Daniel
483f14ec15 working webview implementation of the ccli importer 
Still a WIP:
 - I'll add the old preview thing
 - Need to make default size of the window larger
 - Need to make UI look better
 2020-08-06 02:26:56 +00:00
Tomas Groth
8fe519cada Merge branch 'bibleversionapi' into 'master' 
Bible version api

See merge request openlp/openlp!220
 2020-08-01 19:34:08 +00:00
Fernando Quant
acb6e892a9 Bible version api 2020-08-01 19:34:08 +00:00
Tomas Groth
ec85f1f8b9 Merge branch 'readd_custom_stage_views' into 'master' 
Re-add custom stage view support

See merge request openlp/openlp!223
 2020-08-01 19:32:29 +00:00
Tomas Groth
c6c5f77b03 Merge branch 'add_footer_to_web_api' into 'master' 
Add theme data and footer to web api

Closes #537

See merge request openlp/openlp!224
 2020-08-01 19:30:49 +00:00
Daniel
fc16e0009e Add footer to the object returned in the api 
This is about the only thing left preventing us from running the main web view on react in a similar way the primary display is run. (rather than screenshots)
 2020-08-01 19:30:49 +00:00
Tomas Groth
3c59ac5b2e Merge branch 'fix_close_websocket_server' into 'master' 
Fix closing OpenLP delay(/timeout)

See merge request openlp/openlp!225
 2020-08-01 19:28:19 +00:00
Daniel
e7ffa35000 Actually 'unregister' closed websocket connections 
The recv method will trigger an Exception when the user disconnects
from the server, which means we can unregister them and break the loop.
 2020-08-01 19:28:19 +00:00
Daniel
f69887cd8c Re-add custom stage view support 
Almost a static server. Lets say your stage files are in `stages/mystage/<files>`,
Provided your main html file is named `stage.html`, you can get to it with:
`<openlp_ip>:<openlp_port>/stage/mystage` (this is the same as openlp 2.4.6)

Although you can use the full url, the `stage.html` will be able to directly
link to it's neighbour files with a relative url. (that means you can use
`javascript.js` rather than `/stage/mystage/javascript.js`)
Again, this should be the same as openlp 2.4.6

I think OpenLP 2.4.6 used some sort of template system to fill in the page
title and perhaps a few other things. This does not use a template system
and you only need a standard html file.
 2020-07-25 21:41:28 +12:00
Tim Bentley
a036362237 Merge branch 'fix_change_image_bg_crash' into 'master' 
Fix plugin crash if they don't implement config_update

Closes #623

See merge request openlp/openlp!222
 2020-07-25 06:40:22 +00:00
Raoul Snyman
3ebd175738 Merge branch 'full-service-item' into 'master' 
Move JSON rendering into ServiceItem object; Provide entire service item object through API

See merge request openlp/openlp!221
 2020-07-25 04:01:40 +00:00
Daniel
238088d50b Add config_update as an overrideable plugin fn 2020-07-25 11:53:11 +12:00
Raoul Snyman
5620a6f57f
Expose the entire ServiceItem in the API 
- Move JSON rendering into ServiceItem object
- Provide entire service item object through API
- Fix some potential bugs and write tests
 2020-07-23 17:19:49 -07:00
Tim Bentley
5a4a4e703f Merge branch 'screen-update' into 'master' 
Fix some screen related issues

Closes #253, #261, #44, #376, #566, #565, and #290

See merge request openlp/openlp!209
 2020-07-21 20:05:59 +00:00
Tomas Groth
73221cef9b Remove and add screens without reloading screens. Do not show screen-change-popup when the settings form is visible. 2020-07-21 20:05:59 +00:00
Tim Bentley
eac44f4f24 Merge branch 'fix-appveyor-test-path2' into 'master' 
Try to take appveyor mac/win differences regarding env variables into account.

See merge request openlp/openlp!219
 2020-07-21 13:50:40 +00:00
Tomas Groth
72b5c8cea0 Try to take appveyor mac/win differences regarding env variables into account. 2020-07-16 22:34:41 +02:00
Tomas Groth
66cf59767a Merge branch 'allow-PIs-in-openlyrics-importer' into 'master' 
Allow XML processing istructions in OpenLyrics importer

Closes #548

See merge request openlp/openlp!188
 2020-07-13 08:48:33 +00:00
Gyuris Gellért
8edce313bc Allow XML processing istructions in OpenLyrics importer 2020-07-13 08:48:33 +00:00
Tim Bentley
933a0e6090 Merge branch 'fix-appveyor-test-path' into 'master' 
Remove wrongly placed dollarsign

See merge request openlp/openlp!218
 2020-07-10 21:02:56 +00:00
Tomas Groth
606cbe23c5 Remove wrongly placed dollarsign 2020-07-10 21:02:56 +00:00