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

16578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim
9eb645cc37
Merge branch 'master' of gitlab.com:openlp/openlp 2019-12-07 20:20:21 +00:00
Tim Bentley
72bd9999eb Merge branch 'fedora-vlc-instructions' into 'master' 
Display more detailed instructions when VLC and pymediainfo are missing

See merge request openlp/openlp!96
 2019-12-07 11:41:30 +00:00
Raoul Snyman
d5fc4c5b88 Display more detailed instructions when VLC and pymediainfo are missing 
- On Fedora, mention the need for RPMFusion
- on macOS, reference the VLC website
- On other systems, just display a generic message
- Don't try to load the VLC path on macOS
 2019-12-07 11:41:30 +00:00
Raoul Snyman
ddc53eccb3 Merge branch 'disable-bibleserver' into 'master' 
Disable BibleServer support for now

See merge request openlp/openlp!95
 2019-12-04 22:10:14 +00:00
Tomas Groth
507934e85c Disable BibleServer support for now since we haven't yet figured out how to extract available translations and books in translations. 2019-12-04 22:10:13 +00:00
Tomas Groth
5cfce8c59b Merge branch 'fix-pdf-paths' into 'master' 
Fix a traceback when trying to display a PDF

See merge request openlp/openlp!94
 2019-12-04 20:46:10 +00:00
Tomas Groth
64126cec23 Fix a traceback when trying to display a PDF 2019-12-04 20:46:10 +00:00
Raoul Snyman
3094e6574d Merge branch 'settings_2' into 'master' 
Settings 2

See merge request openlp/openlp!91
 2019-12-04 20:01:03 +00:00
Tim Bentley
9fd6752a83 Try to fix paths in coverage report generation 
- Add the local path to coverage config
- Fix the paths before generating an HTML report
 2019-12-04 20:01:02 +00:00
Tomas Groth
205442fed7 Merge branch 'distro-detection' into 'master' 
Add distribution detection in is_linux() function

See merge request openlp/openlp!93
 2019-12-04 18:15:24 +00:00
Raoul Snyman
771e97862f Add distribution detection in is_linux() function 
- Optional argument to check Linux distro
- Add a test for the new argument
- Add some other tests to expand test coverage
- Remove Windows from testing
- If "distro" module is missing, create a replacement that returns False
 2019-12-04 18:15:24 +00:00
Tim
c1808df463
Merge branch 'master' of gitlab.com:openlp/openlp 2019-12-03 19:55:55 +00:00
Tim Bentley
3b3f92d8b1 Merge branch 'test-improvements-bible_ref_parsing' into 'master' 
Test improvements for bible ref parsing

See merge request openlp/openlp!92
 2019-12-03 19:54:57 +00:00
Ee Savior
c3e6d3f776 Test improvements for bible ref parsing 2019-12-03 19:54:57 +00:00
Tim Bentley
e25859cf61 Merge branch 'fix_renderer_loading_issue' into 'master' 
Fix renderer delayed loading issue

Closes #335

See merge request openlp/openlp!86
 2019-12-03 17:30:35 +00:00
Daniel
7c4d9a5ffd Time out after 10 seconds in wait till loaded fn 
also fixes comment, update_preview_images() does not handle the timeout case but in reality it should never happen. (just in the case it does, it won't stall the whole application)
 2019-12-03 17:30:35 +00:00
Raoul Snyman
02c83bb8a8 Merge branch 'theme_updates' into 'master' 
Theme updates and fixes

Closes #334

See merge request openlp/openlp!85
 2019-12-02 18:07:41 +00:00
Daniel
f8ae9cf719 Change theme_list in theme manager to a dictionary containing the theme objects 
This prevents the need to read the theme file every time it's data is needed.
 2019-12-02 18:07:41 +00:00
Raoul Snyman
17927af24d Merge branch 'test-improvements-test_media-v2' into 'master' 
core-ui-media-__init__: Create test and fix docstring error for format_milliseconds(...). Achieve 100% coverage for __init__.py module

See merge request openlp/openlp!89
 2019-12-02 18:02:13 +00:00
Ee Savior
5935bbe850 core-ui-media-__init__: Create test and fix docstring error for format_milliseconds(...). Achieve 100% coverage for __init__.py module 2019-12-02 18:02:13 +00:00
Tim
1d8ec19a89
Merge branch 'master' of gitlab.com:openlp/openlp 2019-11-29 17:07:28 +00:00
Tim Bentley
ffd25be049 Merge branch 'applocation-win-fix' into 'master' 
Do not resolve paths, since it does not work as expected on windows.

See merge request openlp/openlp!90
 2019-11-29 17:00:12 +00:00
Tomas Groth
4f4de6249d Do not resolve paths, since it does not work as expected on windows. 2019-11-29 17:00:12 +00:00
Tim
5386195441
Merge branch 'master' of gitlab.com:openlp/openlp 2019-11-28 21:49:49 +00:00
Tim Bentley
f5ffc6d57e Merge branch 'test-improvements' into 'master' 
Test improvements

See merge request openlp/openlp!87
 2019-11-26 19:32:16 +00:00
Ee Savior
f50b81b9fb Test improvements 2019-11-26 19:32:16 +00:00
Raoul Snyman
f8e499eaf2 Merge branch 'settings_1a' into 'master' 
Migrate Settings - Part 1

See merge request openlp/openlp!84
 2019-11-26 17:49:42 +00:00
Tim Bentley
8838e671fc Try to fix paths in coverage report generation 
- Add the local path to coverage config
- Fix the paths before generating an HTML report
 2019-11-26 17:49:41 +00:00
Tim Bentley
a9c03092ed Merge branch 'font-select-widget' into 'master' 
Font selection widget

See merge request openlp/openlp!83
 2019-11-22 16:40:10 +00:00
Raoul Snyman
288a02344d Font selection widget 
- Create a font selection widget
- Embed widget in the Theme wizard
- Add tests for the FontSelectWidget
 2019-11-22 16:40:10 +00:00
Raoul Snyman
3ab4c4533b Merge branch 'small-fixes' into 'master' 
Some small fixes

See merge request openlp/openlp!79
 2019-11-20 18:52:17 +00:00
Raoul Snyman
1c4052c627 Some small fixes 
- Convert the return value of 'keys' to a list so that we have an actual copy of it
- Always resolve the path returned by AppLocation
 2019-11-20 18:52:16 +00:00
Raoul Snyman
e94f2b8134 Merge branch 'alpha_1a' into 'master' 
Fix Media crash when blanking running media

See merge request openlp/openlp!81
 2019-11-20 05:36:36 +00:00
Tim Bentley
02f41f794f Try to fix paths in coverage report generation 
- Add the local path to coverage config
- Fix the paths before generating an HTML report
 2019-11-20 05:36:35 +00:00
Raoul Snyman
862a5e563f Merge branch 'spelling' into 'master' 
Corrected typos in 4 files

Closes #329

See merge request openlp/openlp!78
 2019-11-15 16:26:08 +00:00
John Morris
14b763d677 Corrected typos in 4 files 2019-11-15 16:26:08 +00:00
Tim Bentley
a7e7b1fb46 Merge branch 'translations-12112019' into 'master' 
Update Translations as at 12112019

See merge request openlp/openlp!77
 2019-11-13 17:25:01 +00:00
Tim Bentley
f63f7939ac Try to fix paths in coverage report generation 
- Add the local path to coverage config
- Fix the paths before generating an HTML report
 2019-11-13 17:25:00 +00:00
Tim
08dd54a39e
Head 2019-11-10 09:44:51 +00:00
Raoul Snyman
83c8a87ce2 Merge branch 'planningcenter_plugin' into 'master' 
Planningcenter plugin

See merge request openlp/openlp!44
 2019-11-09 16:17:41 +00:00
John Kirkland
dbcdf11c0a Planningcenter plugin 2019-11-09 16:17:41 +00:00
Tim
820bf131c5
Merge branch 'master' of gitlab.com:openlp/openlp 2019-11-03 21:28:11 +00:00
Raoul Snyman
b9e26a1cfb Merge branch 'alpha_1' into 'master' 
Media Fixes for Alpha 1

See merge request openlp/openlp!57
 2019-11-03 21:17:47 +00:00
Tim Bentley
35f7190e00 Try to fix paths in coverage report generation 
- Add the local path to coverage config
- Fix the paths before generating an HTML report
 2019-11-03 21:17:47 +00:00
Tim Bentley
bf7b091db0 Merge branch 'fix-presentations-on-linux' into 'master' 
Fix presentations on Linux (and hopefully Windows too)

Closes #269

See merge request openlp/openlp!75
 2019-11-03 20:46:21 +00:00
Raoul Snyman
06339426d2 Fix presentations on Linux (and hopefully Windows too) 2019-11-03 20:46:21 +00:00
Tim
a796b965b3
Merge branch 'master' of gitlab.com:openlp/openlp 2019-11-02 07:15:46 +00:00
Tim Bentley
656a8479a9 Merge branch 'fix-clone-theme-background-missing-source' into 'master' 
Fix clone theme with missing background source

Closes #322

See merge request openlp/openlp!70
 2019-11-02 07:14:10 +00:00
Daniel
1ac6c052c7 Fix clone theme with missing background source 2019-11-02 07:14:10 +00:00
Tim Bentley
1cc9fd9970 Merge branch 'force-display-screen' into 'master' 
Force the display checkbox to be selected for at least 1 screen

See merge request openlp/openlp!73
 2019-11-02 07:05:08 +00:00