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

17058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim
dc0081f82a
Merge branch 'master' of gitlab.com:openlp/openlp into master 2020-10-20 12:38:31 +01:00
Tim Bentley
f47a168733 Merge branch 'beta_fixes_4' into 'master' 
Fix first run issues

Closes #683 and #682

See merge request openlp/openlp!262
 2020-10-20 11:32:48 +00:00
Daniel
eb3dc6b221 Fix first run issues 2020-10-20 11:32:48 +00:00
Tomas Groth
6bbaa17646 Merge branch 'fixes_oct2020' into 'master' 
Fixes and Updates

See merge request openlp/openlp!263
 2020-10-19 07:18:27 +00:00
Tim Bentley
1c4ae35c9c Fixes and Updates 2020-10-19 07:18:26 +00:00
Tomas Groth
135d652a5d Merge branch 'song_details_api' into 'master' 
Song details api

Closes #673

See merge request openlp/openlp!264
 2020-10-19 07:18:00 +00:00
Daniel
fd7ba2a447 Song details api 2020-10-19 07:18:00 +00:00
Tomas Groth
0fc95c22b2 Merge branch 'fix_win_tests' into 'master' 
Fix win tests

See merge request openlp/openlp!261
 2020-10-11 20:22:55 +00:00
Tim
2ddcbe63bb
Rename API and fix tests 2020-10-11 15:49:05 +01:00
Daniel
c8e13de8f4 Fix win tests 
use posix path when converting to string for comparison
 2020-10-10 19:03:10 +13:00
Tim Bentley
6ea2025888 Merge branch 'beta_fixes_3' into 'master' 
Beta fixes 3

Closes #454, #604, #605, #521, #551, #441, #644, #661, #656, #669, #678, and #680

See merge request openlp/openlp!260
 2020-10-09 06:26:28 +00:00
Daniel
5dea23662a Fix web api issue and crash with small theme 
Potentially fixes some other issues we didn't know about too...
This just stops anything interfering with creating slides,
and stops fetching the slides halfway through processing
 2020-10-09 06:26:28 +00:00
Bastian Germann
8f934c6695 Drop mediainfo system() support 
Drop the support to call the mediainfo binary that is not included in the
installers anymore.
 2020-10-06 17:37:48 +02:00
Tim Bentley
aa6107cea7 Merge branch 'issue-39-font-support' into 'master' 
Try to fix some font issues

Closes #39

See merge request openlp/openlp!257
 2020-10-05 06:33:34 +00:00
Raoul Snyman
47261d206b
Try to fix some font issues 
- Closes #39
 2020-10-04 23:22:31 -07:00
Tomas Groth
c8b328c4f5 Merge branch 'distutils' into 'master' 
Get rid of distutils

See merge request openlp/openlp!247
 2020-10-04 20:52:05 +00:00
Tim Bentley
b367015342 Merge branch 'master' into 'master' 
Clean PDF Controller and its tests

See merge request openlp/openlp!245
 2020-10-04 19:41:14 +00:00
Tim Bentley
6aea6a9d2d Merge branch 'bugs' into 'master' 
presentations: Prevent check_available returning None

See merge request openlp/openlp!252
 2020-10-04 19:40:31 +00:00
Tomas Groth
2b927fc7b4 Merge branch 'sept-2020' into 'master' 
Beta 1 bug fixes

See merge request openlp/openlp!249
 2020-10-04 19:20:11 +00:00
Tim Bentley
867779da43 Stop videos playing if no VLC. 
#633
 2020-10-04 19:20:10 +00:00
Tim Bentley
13f47d2a92 Merge branch 'fix_live_controls_toolbar' into 'master' 
Fix live controls toolbar

See merge request openlp/openlp!255
 2020-10-04 06:32:08 +00:00
Daniel
bee733d016 Fix live controls toolbar 2020-10-04 06:32:07 +00:00
Tim Bentley
6ddaaab5fe Merge branch 'beta_fixes' into 'master' 
Beta fixes

Closes #674 and #676

See merge request openlp/openlp!256
 2020-10-04 06:31:30 +00:00
Daniel
0a174bc6b7 Beta fixes 2020-10-04 06:31:30 +00:00
Raoul Snyman
feda35ee1e Merge branch 'fix_screenshot_freeze' into 'master' 
Fix screenshot freeze

Closes #666

See merge request openlp/openlp!251
 2020-10-02 04:57:17 +00:00
Daniel
bd0308f1b4 Ignore transition speed when no transitions 
Also add/fix tests
 2020-10-02 04:57:17 +00:00
Raoul Snyman
ae7ac7bf35 Merge branch 'ppt-fixes' into 'master' 
Powerpoint fixes

See merge request openlp/openlp!250
 2020-10-02 04:49:49 +00:00
Tomas Groth
48c3a0ca4a Powerpoint fixes 2020-10-02 04:49:49 +00:00
Raoul Snyman
c9c9bc092d Merge branch 'win-dark-mode' into 'master' 
Implement support for windows 10 dark mode, fixes #370.

Closes #370

See merge request openlp/openlp!254
 2020-10-02 02:18:39 +00:00
Tomas Groth
64b62c4f59 Implement support for windows 10 dark mode, fixes #370. 2020-10-02 02:18:39 +00:00
Tim Bentley
f09ce2fed0 Merge branch 'fix_readme_links' into 'master' 
Update README.rst links to work

See merge request openlp/openlp!253
 2020-09-30 06:26:25 +00:00
Daniel
0a9e51a723 Update README.rst links to work 
Removed literal blocks, links now work on gitlab
 2020-09-30 02:44:45 +00:00
Bastian Germann
a0a67f5917 presentations: Prevent check_available returning None 2020-09-29 23:42:16 +02:00
Tim Bentley
92030e63c4 Merge branch 'fix-song-import-tests' into 'master' 
Fix a bunch of tests and warnings

See merge request openlp/openlp!248
 2020-09-29 07:27:43 +00:00
Raoul Snyman
a17039ba30
Fix a bunch of tests and warnings 
Some of the song import tests were not being run, and pytest was warning
about them. I refactored them so that pytest would run them again.

Also, there were some other warnings in the code about deprecations, so
I fixed as many of those as I could too.
 2020-09-28 23:24:16 -07:00
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