Commit Graph

16746 Commits

Author SHA1 Message Date
8ca3b08880 Merge branch 'liveworship-change' into 'master'
Liveworship import change

See merge request openlp/openlp!180
2020-05-07 05:19:20 +00:00
Tomas Groth
b3298d69f4 Liveworship import change 2020-05-07 05:19:20 +00:00
2e86ef8c32 Merge branch 'new-servicefile-format' into 'master'
New service file format

See merge request openlp/openlp!8
2020-05-07 05:18:37 +00:00
Tomas Groth
937c6c3e81 New service file format 2020-05-07 05:18:37 +00:00
Tomas Groth
d2881ad6e1 Merge branch 'master' into 'master'
Fix errors in translatable texts.

See merge request openlp/openlp!179
2020-05-05 18:17:22 +00:00
Mattias Põldaru
e95ee62574 Fix errors in translatable texts. 2020-05-05 18:17:21 +00:00
Tim Bentley
ca6ed027d3 Merge branch 'alpha-fixes5' into 'master'
Fix loading optical and streaming items from servicemanager.

See merge request openlp/openlp!178
2020-05-02 20:10:24 +00:00
Tomas Groth
16f16c74cb Merge branch 'logging_fixes' into 'master'
Logging and Powerpoint fixes

See merge request openlp/openlp!177
2020-05-02 18:53:56 +00:00
Tim Bentley
2223a56268 Logging and Powerpoint fixes 2020-05-02 18:53:56 +00:00
Tim Bentley
6370a71d64 Merge branch 'translations-02052020' into 'master'
Translations 02052020

See merge request openlp/openlp!176
2020-05-02 18:45:38 +00:00
Tim Bentley
5d5e2ed041 Translations 02052020 2020-05-02 18:45:37 +00:00
Tomas Groth
1fb99e543e When creating media service items, validate items after adding capabilities. Fixes loading optical and streaming items from servicemanager. 2020-05-02 14:04:53 +02:00
d4f75e4fb4 Merge branch 'smooth_transparency_transitions' into 'master'
Smooth transparency transitions

Closes #507

See merge request openlp/openlp!169
2020-04-27 16:20:53 +00:00
Daniel
f4e30c15cc Always use transparency when going to desktop
Except when the display workaround is enabled of course :)
2020-04-27 16:20:51 +00:00
Tim Bentley
c203de0b7a Merge branch 'fix-pdf-from-servicemanager' into 'master'
Fix loading PDF items from the servicemanager

See merge request openlp/openlp!175
2020-04-27 11:50:34 +00:00
Tomas Groth
3de2435631 Fix loading PDF items from the servicemanager
In slidecontroller::_process_item a copy was made of the serviceitem, but it wasen't always used, which caused issues since that item was converted from a presentation/command item to an image item for PDFs.
2020-04-27 11:50:34 +00:00
Tim Bentley
78aa6757fa Merge branch 'api_improvments' into 'master'
Api improvements

See merge request openlp/openlp!174
2020-04-26 21:37:36 +00:00
Tim Bentley
da01b2a8f2 Api improvements 2020-04-26 21:37:35 +00:00
Tomas Groth
b85245465e Merge branch 'upload-to-pypi' into 'master'
Add deploying to PyPI when a tag is created

See merge request openlp/openlp!173
2020-04-24 10:56:12 +00:00
Tomas Groth
1c2727b3d9 Merge branch 'issue-471' into 'master'
Download version from get.openlp.org

Closes #471

See merge request openlp/openlp!172
2020-04-24 10:55:41 +00:00
2f55d5aa6b
Add deploying to PyPI when a tag is created 2020-04-23 23:41:19 -07:00
901a41b87b
Make OpenLP download version files from get.openlp.org; fixes #471 2020-04-23 22:57:12 -07:00
Tomas Groth
0193ef3f7c Merge branch 'Fix_theme_image_transparency' into 'master'
Fix theme image transparency

Closes #506

See merge request openlp/openlp!167
2020-04-20 20:13:11 +00:00
Daniel
3a93e52d2c Remove global background
Add new "global" background as checker board for non displays.
2020-04-20 20:13:11 +00:00
c24f018775 Merge branch 'fix-appveyor-test' into 'master'
Attempt to fix test on windows.

See merge request openlp/openlp!171
2020-04-11 04:52:06 +00:00
Tomas Groth
1ffae03a85 Attempt to fix test on windows. 2020-04-11 04:52:06 +00:00
Tomas Groth
b14424a0df Merge branch 'fix_slow_preview_after_fetching_live-image' into 'master'
Fix slow preview after fetching live image

Closes #504

See merge request openlp/openlp!166
2020-04-10 18:25:12 +00:00
Daniel
a02ca297d6 Fix slow preview after fetching live image 2020-04-10 18:25:12 +00:00
3547430096 Merge branch 'more_fixes' into 'master'
More Bug fixes

See merge request openlp/openlp!164
2020-04-09 21:55:27 +00:00
Tim Bentley
42e6640339 Cleanups, add missing theme functionality 2020-04-09 21:55:27 +00:00
Tim Bentley
92d67468e2 Merge branch 'ftw-remote-download' into 'master'
Web Remote Version Checking and Downloads; Other Fixes

See merge request openlp/openlp!159
2020-04-08 07:00:39 +00:00
6bbe01e7c9
Web Remote Version Checking and Downloads; Other Fixes
- Download the web remote as part of the FTW
- Add version checking for the web remote
- Always order the authors when exporting to OpenLyrics
- Write tests for a bunch of things.
2020-04-07 23:36:14 -07:00
Tim Bentley
fb006dabcd Merge branch 'fix-unreadable-footer-380' into 'master'
Fix up the formatting of the contents of the help box

Closes #380

See merge request openlp/openlp!163
2020-04-04 06:51:02 +00:00
Tim Bentley
ab08968b5e Merge branch 'toggle_transparency' into 'master'
Toggle transparency

Closes #475

See merge request openlp/openlp!160
2020-04-04 06:48:18 +00:00
Daniel
4b50c6f5d2 fix core/logo hide on startup setting, fix display stuck as hidden and invert transparent display setting 2020-04-04 06:48:18 +00:00
efd97644c8
Fix up the formatting of the contents of the help box
- Fix #380
- Fix some tests
- Add some tests

Fix some tests, add some tests
2020-04-02 21:42:35 -07:00
Tomas Groth
73da7f8315 Merge branch 'alpha-fixes4' into 'master'
Fix presentation load from service file

Closes #481

See merge request openlp/openlp!162
2020-04-02 20:24:58 +00:00
Tomas Groth
d1b051807b Fix presentation load from service file 2020-04-02 20:24:58 +00:00
90aad493b6 Merge branch 'broken_stuff' into 'master'
Broken stuff

Closes #477

See merge request openlp/openlp!161
2020-04-02 18:48:27 +00:00
Tim Bentley
3f41c852f2 Fix some race conditions, remove calls to ImageManager, fix a crash in the remote API, fix some more test issues. 2020-04-02 18:48:27 +00:00
d451f21c0b Merge branch 'workingon-api' into 'master'
Added basic theme API

See merge request openlp/openlp!128
2020-04-01 18:26:59 +00:00
Fernando Quant
5e4559cdb3 Added basic theme API 2020-04-01 18:26:57 +00:00
b85d6e0ded Merge branch 'tests_interfaces_1' into 'master'
Tests interfaces 1

See merge request openlp/openlp!158
2020-03-19 20:04:28 +00:00
Tim Bentley
cbc9f8c8e2 Tests interfaces 1 2020-03-19 20:04:28 +00:00
Tim Bentley
86d730f1c7 Merge branch 'upgrade-web-remote' into 'master'
Refactor web remote deployment, plus other fixes and enhancements

See merge request openlp/openlp!153
2020-03-19 16:44:14 +00:00
73507884fb
Refactor web remote deployment, plus other fixes and enhancements
- Refactor deployment away from the web server thread
- Refactor the web remote settings tab
- Provide a way for threads to show an error message to the user
- Fix an issue where multiple zeroconf services were being run instead of a single instance on multiple addresses
- Refactored the DownloadProcess dialog
- Fix the tests
2020-03-17 19:31:18 -07:00
Tim Bentley
4a667c77fc Merge branch 'api-return-on-empty-search' into 'master'
Always return a list when searching in the API

Closes web-remote#1

See merge request openlp/openlp!156
2020-03-14 17:00:09 +00:00
Tim Bentley
73afe240dc Merge branch 'tests_plugin_5' into 'master'
Tests plugin 5

See merge request openlp/openlp!157
2020-03-11 21:53:41 +00:00
Tim Bentley
fa9a3c6f92 Tests plugin 5 2020-03-11 21:53:41 +00:00
Daniel
48901cecfc always return a list when searching in the api
It is not a error when no search results are returned, it is to be expected. The api should return a empty list to show that there were no results (status code 200 OK) rather than a 400 (BAD REQUEST).
2020-03-11 13:22:37 +13:00