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
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
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
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