Commit Graph

17138 Commits

Author SHA1 Message Date
Raoul Snyman 1df944854e Merge branch 'fix-macos-appveyor' into 'master'
Homebrew should not be a shallow clone

See merge request openlp/openlp!278
2020-12-21 02:18:59 +00:00
Raoul Snyman b5da7b8e74 Merge branch 'fix_song_and_image_upgrade_sql_error' into 'master'
Fix apostrophe issue

Closes #699 and #698

See merge request openlp/openlp!276
2020-12-20 21:12:38 +00:00
Raoul Snyman 05a024015e
Homebrew should not be a shallow clone 2020-12-20 14:07:49 -07:00
Raoul Snyman 5fe3a43fe7 Merge branch 'update-pymupdf-support' into 'master'
Update our code to support newer versions of PyMuPDF

See merge request openlp/openlp!277
2020-12-20 16:55:09 +00:00
Raoul Snyman 3a83c210ba
Update our code to support newer versions of PyMuPDF 2020-12-20 09:45:37 -07:00
Raoul Snyman 90343cf3bf Merge branch 'move-settings-around' into 'master'
Refactor the settings somewhat

See merge request openlp/openlp!275
2020-12-20 06:52:42 +00:00
Daniel 08478732d0 use sql parameters to insert file names
fixes sql injection issues
2020-12-20 19:31:05 +13:00
Raoul Snyman cbf37ce8b3
Refactor the settings somewhat
- Created a new Service tab
- Moved service-specific items to service tab
- Moved UI settings to general tab
- Did some general UI cleanup

Update/add tests
2020-12-17 16:13:05 -07:00
Raoul Snyman ddc6e276a3 Merge branch 'appveyor-py39-adjust' into 'master'
Remove forced appveyor packaging (merged by mistake)

See merge request openlp/openlp!274
2020-12-04 05:39:52 +00:00
Tomas Groth 01039cb9d7 Remove forced appveyor packaging (merged by mistake) 2020-12-04 05:56:19 +01:00
Tim Bentley a4911076ba Merge branch 'fix-cornercase-screens' into 'master'
Fix a bug in the screens code

See merge request openlp/openlp!273
2020-12-03 08:11:46 +00:00
Raoul Snyman 8bf07cff64
Fix a bug in the screens code 2020-12-02 23:08:15 -07:00
Tim 7e3bc679b0
Merge branch 'master' of gitlab.com:openlp/openlp into master 2020-11-29 14:20:07 +00:00
Tim Bentley d8a21434d0 Merge branch 'appveyor-py39' into 'master'
Use python 3.9 on appveyor and only create bundles on tags or when running scheduled builds.

See merge request openlp/openlp!271
2020-11-26 08:37:59 +00:00
Tomas Groth 69e2e7e0d4 Merge branch 'fix_image_theme' into 'master'
Fix image/pdf background inconsistancies

Closes #692

See merge request openlp/openlp!270
2020-11-24 20:23:36 +00:00
Daniel 9a1605694a Remove image background setting
Background images never needed this because they expand to fit
Foreground images will get a theme background
2020-11-24 20:23:35 +00:00
Tomas Groth ebea1a283f Use python 3.9 on appveyor and only create bundles on tags or when running scheduled builds. 2020-11-24 21:21:18 +01:00
Tim Bentley 7a4e3e9b85 Merge branch 'nov_fixes' into 'master'
Two text fixes and a PDF startup error

Closes #695

See merge request openlp/openlp!269
2020-11-20 14:26:38 +00:00
Tim Bentley a9f2bf1461 Two text fixes and a PDF startup error 2020-11-20 14:26:38 +00:00
Tomas Groth 0b739159b1 Merge branch 'mediainfo' into 'master'
Drop mediainfo system() support

See merge request openlp/openlp!258
2020-11-18 08:45:13 +00:00
Tim Bentley 9b23bac56b Merge branch 'translations-18112020' into 'master'
Translations 18112020

See merge request openlp/openlp!268
2020-11-18 08:42:42 +00:00
Tim Bentley 07a19c7566 Translations 18112020 2020-11-18 08:42:42 +00:00
Tim 8b9c3a681c
Merge branch 'master' of gitlab.com:openlp/openlp into master 2020-11-17 08:49:42 +00:00
Raoul Snyman 83e0d728e4 Merge branch 'beta_fixes_2' into 'master'
Video/VLC fixes

Closes #679

See merge request openlp/openlp!259
2020-11-17 03:59:39 +00:00
Daniel 06e0d9d522 Add a delay to closing vlc
This gives time for the web engine to appear, preventing any flicker to the desktop
2020-11-17 03:59:38 +00:00
Tomas Groth c4c6a4c25c Merge branch 'issue-655' into 'master'
Fix some upgrade issues

Closes #655

See merge request openlp/openlp!266
2020-11-16 20:31:45 +00:00
Raoul Snyman 601fa58594
Fix some upgrade issues
- Fix an issue with loading screens from older versions of OpenLP (fixes #655)
- Fix an issue where presentations that no longer exist throw an error
- Fix a bug in the serialization of Path objects for Pyro4
- Add some tests for untested scenarios
- Fix some tests
2020-11-15 23:40:07 -07:00
Tim 68d39fdc25
Merge branch 'master' of gitlab.com:openlp/openlp into master 2020-11-02 07:59:56 +00:00
Raoul Snyman 578c627d24 Merge branch 'fix-theme-api' into 'master'
Fix theme api

See merge request openlp/openlp!265
2020-10-28 04:06:56 +00:00
Fernando Quant ae5c5b204a Fix theme api 2020-10-28 04:06:56 +00:00
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