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
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
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
Tim Bentley
c7ddbcf5d1
Merge branch 'appveyor-macos' into 'master'
...
Refactor the appveyor setup
Closes #599
See merge request openlp/openlp!206
2020-07-10 19:45:00 +00:00
Tomas Groth
cad3661c56
Refactor the appveyor setup
2020-07-10 19:45:00 +00:00
Tomas Groth
0f45b7a039
Merge branch 'revert-fix' into 'master'
...
Revert a "fix"
See merge request openlp/openlp!217
2020-07-08 20:15:37 +00:00
Mattias Põldaru
65f7af0e9f
Revert recently introduced bug causing video background to be on top of lyrics. The crash this was supposed to fix is no longer present.
2020-07-08 20:15:37 +00:00
Tim Bentley
4ffd7f5a6f
Merge branch 'remove-font-license' into 'master'
...
Remove an unnecessary license file
See merge request openlp/openlp!216
2020-07-06 06:25:57 +00:00
Tim Bentley
6329b73d48
Merge branch 'fix-icons-macos' into 'master'
...
Fix the colour of the icons on macOS
Closes #577
See merge request openlp/openlp!215
2020-07-06 06:25:30 +00:00
6c5bcf4b03
Remove an unnecessary license file
2020-07-03 22:39:31 -07:00
5c0082e434
Fix the colour of the icons on macOS
2020-07-03 22:18:17 -07:00
Tim Bentley
28a7840b9f
Merge branch 'dynamic_themes' into 'master'
...
Dynamic themes
See merge request openlp/openlp!200
2020-07-01 16:12:01 +00:00
Daniel
59c0aba7fb
Set default header and footer areas if not overridden
...
Do this every time the theme is read from file or the display resolution changes
2020-07-01 16:12:00 +00:00
Tim Bentley
5b20945c34
Merge branch 'fix_progress_bar_crash' into 'master'
...
Fix large service file crash
Closes #594
See merge request openlp/openlp!213
2020-07-01 16:10:28 +00:00
Daniel
f6b4f8229e
scale service save progress increments to thousandths
...
(Progress bar size == 1000 rather than a potential int overflow using the file size)
2020-07-01 16:10:28 +00:00
Tim Bentley
f8cfda1ed3
Merge branch 'fix_loading_saved_services' into 'master'
...
Fix loading saved services
Closes #622 and #611
See merge request openlp/openlp!212
2020-07-01 16:09:44 +00:00
Daniel
357fe20c91
Fix incorrect image title from loading service
...
This fixes the crash when you select a image loaded from a service file
2020-07-01 16:09:44 +00:00
Tim Bentley
14aa717272
Merge branch 'fixes_june_2' into 'master'
...
Fixes june 2 - missed change
See merge request openlp/openlp!211
2020-06-21 07:17:35 +00:00
Tim Bentley
0f43a84ff3
Fix Image Backgounds and remove Image Manager
...
Resolves ##480
2020-06-21 07:17:35 +00:00
Tim Bentley
fa5055c033
Merge branch 'appveyor-only-pack-on-master' into 'master'
...
Only do the packaging on appveyor when merging into master
See merge request openlp/openlp!82
2020-06-20 08:26:15 +00:00
Tomas Groth
64596bb492
Only do the packaging on appveyor when merging into master
2020-06-20 08:26:15 +00:00
Tim Bentley
84d94cb535
Merge branch 'fixes_june_2' into 'master'
...
Fixes June 2
See merge request openlp/openlp!210
2020-06-20 06:06:31 +00:00
Tim Bentley
f8d747e236
Fix Image Backgounds and remove Image Manager
...
Resolves ##480
2020-06-20 06:06:31 +00:00
Tim Bentley
d117430175
Merge branch 'websockets' into 'master'
...
Upgrade and cleanup WebSocket code
See merge request openlp/openlp!208
2020-06-17 19:09:05 +00:00
Tim
e6fa02a75e
Upgrade and cleanup WebSocket code
2020-06-17 14:49:31 +01:00
Tomas Groth
70ae1a8494
Merge branch 'alpha2-fixes' into 'master'
...
Various alpha2 fixes
See merge request openlp/openlp!207
2020-06-14 19:50:23 +00:00
Tomas Groth
8765b0045c
Various alpha2 fixes
...
* Fix BibleGateway integration.
* Fix traceback when cloning song.
* Fix traceback when running portable build.
2020-06-13 21:36:38 +02:00
Tim Bentley
af1dd70589
Merge branch 'features_june_1' into 'master'
...
Fix up a number of bugs from 2.9.1
Closes #294 , #587 , #584 , and #295
See merge request openlp/openlp!204
2020-06-10 20:10:56 +00:00
Tim Bentley
a55fdbf0c8
Update API definition
...
resolves #295
2020-06-10 20:10:56 +00:00
Tim Bentley
059f953aa6
Merge branch 'settings_cleanup_1' into 'master'
...
Settings cleanup
See merge request openlp/openlp!197
2020-06-06 16:05:37 +00:00
Tim Bentley
6eba3b7a3e
Settings cleanup
2020-06-06 16:05:36 +00:00
e2cd0cc4a0
Merge branch 'release-2.9.1' into 'master'
...
Release 2.9.1
See merge request openlp/openlp!203
2020-05-30 22:38:45 +00:00
55a9070140
Release 2.9.1
2020-05-30 15:36:11 -07:00
6e4673f8d6
Merge branch 'bug-547' into 'master'
...
Fix a number of servicefile related issues
Closes #547
See merge request openlp/openlp!198
2020-05-30 20:57:30 +00:00