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

16968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Raoul Snyman
6c5bcf4b03
Remove an unnecessary license file 2020-07-03 22:39:31 -07:00
Raoul Snyman
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
Raoul Snyman
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
Raoul Snyman
55a9070140
Release 2.9.1 2020-05-30 15:36:11 -07:00
Raoul Snyman
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
Tomas Groth
01fac492e9 A few image related fixes. 
* Use the image itself as a thumbnail if none is available, fixes #547
 * Store the thumbnail path in service files, no matter if light or not.
 * Added convertion of image thumbnail to sha256 as part of DB upgrade.
 2020-05-30 20:57:29 +00:00
Raoul Snyman
771d579147 Merge branch 'fixes2' into 'master' 
No internet traceback

Closes #572

See merge request openlp/openlp!202
 2020-05-30 06:35:09 +00:00
Mattias Põldaru
0419e80aec No internet traceback 2020-05-30 06:35:09 +00:00
Raoul Snyman
73ece5dfd2 Merge branch 'translations-29052020' into 'master' 
Translations 29052020

See merge request openlp/openlp!201
 2020-05-30 06:34:22 +00:00
Tim Bentley
b3b9b6d288 Translations 29052020 2020-05-30 06:34:22 +00:00
Raoul Snyman
9800aa18e4 Merge branch 'fixes' into 'master' 
Fix a freeze on Windows

Closes #570

See merge request openlp/openlp!199
 2020-05-30 06:33:39 +00:00
Mattias Põldaru
7f4f6a2bfa Fix a freeze on Windows 2020-05-30 06:33:39 +00:00
Tim Bentley
53b58f777f Merge branch 'library-toolbar' into 'master' 
UI changes

See merge request openlp/openlp!193
 2020-05-26 20:29:06 +00:00
Mattias Põldaru
2e58939382 Change preview/live left/right icons to up/down, as the slides are shown in preview, and just as keyboard shortcuts. 2020-05-26 20:29:05 +00:00