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

17173 Commits

Author SHA1 Message Date
Bastian Germann dc967baf00 Get rid of distutils 2020-09-29 01:22:28 +02:00
Tim Bentley a61541a6ad Merge branch 'fix-coverage-data' into 'master' 
Fix the coverage data generation

See merge request openlp/openlp!244
 2020-09-28 21:04:46 +00:00
Bastian Germann 2c577e2382 Remove unused check_binary_exists 2020-09-28 22:38:22 +02:00
Bastian Germann 04e3ef5d86 Clean pdfcontroller from mupdf/ghostscript 2020-09-28 22:17:50 +02:00
Bastian Germann 2caf9c0f94 Install latest PyMuPDF 2020-09-28 22:03:37 +02:00
Bastian Germann e09aec5d34 test_pdfcontroller: Get rid of platform specifics 
As system() called PDF controllers are removed, test_pdfcontroller can be
simplified because PyMuPDF will use the mocked screen.
Get rid of the platform-dependent screen size obtaining which gets rid of
the Xlib dependency.
 2020-09-28 21:58:05 +02:00
Raoul Snyman 5df9b99f1b
Fix the coverage data generation 2020-09-28 11:28:57 -07:00
Tomas Groth 8c888b9a00 Merge branch 'distutils' into 'master' 
Replace distutils.dir_util.copy_tree with shutil.copytree

See merge request openlp/openlp!242
 2020-09-28 07:12:29 +00:00
Tomas Groth 93fa844683 Merge branch 'gpl3' into 'master' 
Relicense GPL-2 files

See merge request openlp/openlp!243
 2020-09-28 07:08:16 +00:00
Bastian Germann 5e981be6fe Relicense GPL-2 files 
There are still some leftovers or new files that are still GPL-2 licensed.
Relicense them according to the contributors' agreements to change the
license to GPL-3+.
 2020-09-27 14:53:27 +02:00
Bastian Germann 1473ff5d4a Replace distutils.dir_util.copy_tree with shutil.copytree 2020-09-27 13:59:56 +02:00
Raoul Snyman 793a801235 Merge branch 'fixes-for-beta1' into 'master' 
Various fixes for beta1

Closes #660

See merge request openlp/openlp!232
 2020-09-26 23:40:29 +00:00
Tomas Groth 3e8d57db6a Various fixes for beta1 2020-09-26 23:40:29 +00:00
Tim Bentley d41e0316f4 Merge branch 'fix-macos-pdfcontroller-test' into 'master' 
Fix the PDF Controller tests on macOS

See merge request openlp/openlp!240
 2020-09-26 20:06:34 +00:00
Tim Bentley bd32b892f2 Merge branch 'fix-crosswalk-bibles' into 'master' 
Fix the CrossWalk Biblestudytools.com importer

See merge request openlp/openlp!241
 2020-09-26 20:05:42 +00:00
Tim Bentley fef70e4af4 Merge branch 'fix-mediashout-test' into 'master' 
Fix problem with new MediaShout test

See merge request openlp/openlp!239
 2020-09-26 20:04:56 +00:00
Tomas Groth cc738cca3f Merge branch 'check_depends_fix' into 'master' 
Fix in ./scripts/check_dependencies.py

See merge request openlp/openlp!238
 2020-09-26 19:42:10 +00:00
Raoul Snyman 7734ce89a0
Fix the CrossWalk Biblestudytools.com importer 2020-09-25 23:13:10 -07:00
Raoul Snyman 52e9daaf5d
Fix the PDF Controller tests on macOS 2020-09-25 22:06:45 -07:00
Raoul Snyman ed488621aa
Fix problem with new MediaShout test 2020-09-25 21:52:12 -07:00
Martin Zibricky 8786a8cc7a Fix in ./scripts/check_dependencies.py 
- fix pytest-qt import
- replace __import__ with importlib
- fix fitz description
 2020-09-25 16:11:20 +02:00
Tim Bentley 844399b54f Merge branch 'issue-62-rename-song-importer' into 'master' 
Rename OpenLP 2.0 Song Importer

Closes #62

See merge request openlp/openlp!237
 2020-09-24 07:12:25 +00:00
Tim Bentley db25e78f03 Merge branch 'issue-35-mediashout-traceback' into 'master' 
Fix two bugs in the MediaShout importer

See merge request openlp/openlp!236
 2020-09-24 07:12:14 +00:00
Raoul Snyman d18faa5233
Hopefully fix some confusion, fixes #62 2020-09-23 19:20:06 -07:00
Raoul Snyman 74a72877d8
Fix two bugs in the MediaShout importer 
- Fix a bug where the "Themes" table was never read due to an incorrect "if" statement
- Fix a bug where the "Groups" table was presumed to exist, but doesn't always (bug #35)
 2020-09-23 15:25:37 -07:00
Tim Bentley ac161d79ed Merge branch 'sept-2020' into 'master' 
Fixes Sept 2020

Closes #633

See merge request openlp/openlp!231
 2020-09-23 08:37:57 +00:00
Tim Bentley 09b57c3cd7 Stop videos playing if no VLC. 
#633
 2020-09-23 08:37:57 +00:00
Tim Bentley 3c224a9874 Merge branch 'issue-434-fix-wordproject-import' into 'master' 
Fix #434 by handling links with titles

Closes #434

See merge request openlp/openlp!235
 2020-09-23 06:42:20 +00:00
Raoul Snyman 0eadcc535f
Fix #434 by handling links with titles 2020-09-22 22:42:45 -07:00
Raoul Snyman a1941da34b Merge branch 'beta1_bugfixes_2' into 'master' 
Beta1 bugfixes round 2

Closes #668 and #667

See merge request openlp/openlp!234
 2020-09-23 04:50:09 +00:00
Daniel b5a2eef4e7 Fix api crash when sending thumbnail path 
For things with thumbnails that aren't images (just presentations I think)
 2020-09-23 04:50:09 +00:00
Tim Bentley 35c56cecdb Merge branch 'bug_fixes' into 'master' 
Bug fixes for beta1

Closes #588, #662, #663, and #664

See merge request openlp/openlp!233
 2020-09-20 17:35:49 +00:00
Daniel b33d27f77c Fix theme combo box not showing at start 
The theme combo box did not show when the currently rendered item
doesn't support the service/song theme levels.

This changes the theme combo box to use the theme level from the
settings rather than the currently rendered item.
 2020-09-20 17:35:49 +00:00
Raoul Snyman fdf5cce5f2 Merge branch 'keynote-ppt-mac' into 'master' 
Add support for presentation with Keynote and PowerPoint on Mac

See merge request openlp/openlp!205
 2020-09-13 14:49:02 +00:00
Tomas Groth cd22bfaa51 Started work on support for powerpoint on mac. Changed the script execution approach from osascript to py-applescript. Not tested. At all. 2020-09-13 14:49:02 +00:00
Tim Bentley ec9d5b9099 Merge branch 'theme-thumbnails-api' into 'master' 
Theme thumbnails api

See merge request openlp/openlp!227
 2020-08-27 06:19:47 +00:00
Fernando Quant 0a64cc95ec Themes api get_themes returns the preview image instead of the full background image in the theme_list 2020-08-27 06:19:47 +00:00
Tim Bentley e2a65a3264 Merge branch 'fix-image-db-upgrade' into 'master' 
Fix image db upgrade

Closes #585, #649, and #607

See merge request openlp/openlp!230
 2020-08-18 06:47:02 +00:00
Tomas Groth 04feb3ee67 Fix image db upgrade 2020-08-18 06:47:02 +00:00
Tim Bentley 6711cbee9d Merge branch 'fix-font-file' into 'master' 
Remove the references to FontAwesome, this file does not contain FontAwesome at all

See merge request openlp/openlp!228
 2020-08-15 13:38:32 +00:00
Tomas Groth 8aae8cdece Merge branch 'allow-whitespaces-in-openlyrics-lines-tag' into 'master' 
Allow whitespaces inside <lines>

Closes #550

See merge request openlp/openlp!229
 2020-08-13 19:40:14 +00:00
Gyuris Gellért 7df43c7dfb Add solution to remove extra whitespaces from OL <lines> tag 
Related to #550
 2020-08-13 19:40:14 +00:00
Raoul Snyman 58e2e50610
Remove the references to FontAwesome, this file does not contain FontAwesome at all 2020-08-12 21:48:32 -07:00
Raoul Snyman a944791a70 Merge branch 'ccli_fix' into 'master' 
Fix CCLI with the QT WebEngine

See merge request openlp/openlp!214
 2020-08-06 02:26:56 +00:00
Daniel 483f14ec15 working webview implementation of the ccli importer 
Still a WIP:
 - I'll add the old preview thing
 - Need to make default size of the window larger
 - Need to make UI look better
 2020-08-06 02:26:56 +00:00
Tomas Groth 8fe519cada Merge branch 'bibleversionapi' into 'master' 
Bible version api

See merge request openlp/openlp!220
 2020-08-01 19:34:08 +00:00
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