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

16805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Raoul Snyman
72657759cf Merge branch 'various_fixes' into 'master' 
Various fixes

Closes #553, #72, #56, #552, and #527

See merge request openlp/openlp!195
 2020-05-25 05:01:12 +00:00
Daniel
b4648ee618 Fix preview flicker 
fixes #553
This line is not needed as the display will move
to the first slide by default.
 2020-05-25 05:01:12 +00:00
Tim Bentley
51a57ae5f2 Merge branch 'fix_broken_settings' into 'master' 
Fix broken settings

Closes #61, #478, and #479

See merge request openlp/openlp!189
 2020-05-21 20:17:03 +00:00
Daniel
59ab4a1ad4 remove unused themes/wrap footer setting 
Maybe add a new theme attribute for this later
 2020-05-21 20:17:03 +00:00
Tim Bentley
a77b57d334 Merge branch 'api_updates_1705' into 'master' 
Resolve issues with theme changes.

See merge request openlp/openlp!194
 2020-05-20 07:40:23 +00:00
Tim Bentley
67f4a0cc81 Resolve issues with theme changes. 
Add new clear api's
 2020-05-20 07:40:23 +00:00
Raoul Snyman
8d58fb76ca Merge branch 'fixes' into 'master' 
Random fixes

See merge request openlp/openlp!191
 2020-05-18 18:00:42 +00:00
Mattias Põldaru
4c2c7b6ab1 Various fixes: 
- Remove a traceback on exiting OpenLP
- Add back toolbar separator
- Fix biblegateway webpage parsing for tests
- Remove live_display argument from VlcPlayer.setup, is incorrectly passed the preview value
 2020-05-18 18:00:40 +00:00
Tim Bentley
a304c98502 Merge branch 'fix-api-issues' into 'master' 
Fix various issues and return current theme in API

Closes #541

See merge request openlp/openlp!192
 2020-05-16 07:31:34 +00:00
Raoul Snyman
181b4fdcc9
Fix various issues and return current theme in API: 
- New API method to return current theme
- Use single method to set service items via both position and uuid
- Update tests to match above new features
- Fix issue where chords were not being returned to the API
- Fix the clear/backspace icon (the old one doesn't exist in Debian)
 2020-05-15 23:11:55 -07:00
Raoul Snyman
e8db9dd524 Merge branch 'api_changes' into 'master' 
Api changes and fixes

See merge request openlp/openlp!190
 2020-05-16 06:11:21 +00:00
Tim Bentley
6876bbd531 Clean up Apis and remove duplicate files. 
Add new API to help testings
 2020-05-16 06:11:21 +00:00
Tim Bentley
a9a96146b0 Merge branch 'alpha-fixes6' into 'master' 
Fix a traceback to wrongful path to string convertion

See merge request openlp/openlp!187
 2020-05-11 18:28:37 +00:00