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

17116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Bentley
c7112a1f78 Merge branch 'bible-fixes' into 'master' 
Fixes for the bible plugin.

See merge request openlp/openlp!290
 2021-01-21 07:59:35 +00:00
Tomas Groth
282a845a10 Fixes for the bible plugin. Fix placement of alternative_book_names.sqlite for portable installs. Fix gui elements not updating when only one bible is available. 2021-01-21 07:59:34 +00:00
Tomas Groth
9f41ce1159 Merge branch 'appveyor-py38-again' into 'master' 
Retry setting appveyor to set python version to 3.8 so that windows 7 is supported.

See merge request openlp/openlp!289
 2021-01-20 19:30:22 +00:00
Tim Bentley
53b061dac6 Merge branch 'Issue-740' into 'master' 
Handle load of Service with missing Plugin - Issue 740

Closes #740

See merge request openlp/openlp!288
 2021-01-19 21:53:24 +00:00
Tomas Groth
8d235e04db Retry setting appveyor to set python version to 3.8 so that windows 7 is supported. 2021-01-19 21:22:27 +01:00
Tim
e682f39fe6
Fix bug #740 where plugin is not loaded. 2021-01-18 15:44:43 +00:00
Tim
b4627896d3
Merge branch 'master' of gitlab.com:openlp/openlp 2021-01-12 12:03:11 +00:00
Tim Bentley
965dd70567 Merge branch 'fix_http_poll' into 'master' 
Fix http poll routes

Closes #707

See merge request openlp/openlp!283
 2021-01-08 15:01:54 +00:00
Daniel Martin
da31226029 Fix http poll routes 2021-01-08 15:01:53 +00:00
Tomas Groth
9194273341 Merge branch 'enable_qt_dpi_scaling' into 'master' 
Enable QT DPI scaling

See merge request openlp/openlp!287
 2021-01-03 17:37:20 +00:00
Tomas Groth
561745166a Merge branch 'fix_#713' into 'master' 
Fix #713 - Bible Combo Crash

Closes #713

See merge request openlp/openlp!284
 2021-01-03 17:34:39 +00:00
Tim Bentley
b27f0c69d7 Fix #713 - Bible Combo Crash 2021-01-03 17:34:39 +00:00
Tomas Groth
714d69ad6a Merge branch 'fix_missing_text' into 'master' 
Fix missing text with optional splits on some themes

Closes #714

See merge request openlp/openlp!286
 2021-01-03 14:32:00 +00:00
Daniel Martin
7b8c4a31c9 Prevent empty slides being added 
And some comments and grammer
 2021-01-03 14:32:00 +00:00
Tim
6d9fafa020
Merge branch 'master' of gitlab.com:openlp/openlp 2021-01-01 08:02:54 +00:00
Daniel
c8c2c41641 enable qt dpi scaling 2020-12-31 20:23:58 +13:00
Tim Bentley
418c0861d7 Merge branch 'End_of_2020' into 'master' 
End of 2020 - Just change the Year!

See merge request openlp/openlp!285
 2020-12-30 21:42:49 +00:00
Tim Bentley
aade849aca End of 2020 - Just change the Year! 2020-12-30 21:42:49 +00:00
Tomas Groth
303b3ded15 Merge branch 'update-all-icons' into 'master' 
Update the icons -- these are used on some Linux platforms

See merge request openlp/openlp!282
 2020-12-22 07:34:53 +00:00
Tomas Groth
010c01ba6d Merge branch 'fix-pytest-fixtures' into 'master' 
Yield fixtures are deprecated; the regular fixture does the same job

See merge request openlp/openlp!281
 2020-12-22 07:33:32 +00:00
Raoul Snyman
3ef8cbd2fa
Update the icons -- these are used on some Linux platforms 2020-12-22 00:27:05 -07:00
Tomas Groth
30c410ab83 Merge branch 'appveyor-release' into 'master' 
Try to fix and force release build

See merge request openlp/openlp!280
 2020-12-22 07:19:38 +00:00
Tomas Groth
5f9848a0be Try to fix and force release build 2020-12-22 07:19:38 +00:00
Raoul Snyman
3fb4eee9f3
Yield fixtures are deprecated; the regular fixture does the same job 2020-12-21 21:41:57 -07:00
Tim
7698c5da8c
Merge branch 'master' of gitlab.com:openlp/openlp 2020-12-21 14:15:16 +00:00
Tomas Groth
5879ebd4d6 Merge branch 'appveyor-rollback-python-3.8' into 'master' 
Rollback Python in AppVeyor to 3.8

See merge request openlp/openlp!279
 2020-12-21 06:03:39 +00:00
Raoul Snyman
16425fa72a
Rollback Python in AppVeyor to 3.8 2020-12-20 22:36:38 -07:00
Raoul Snyman
5211a9249d
Release 2.9.2 2020-12-20 20:51:59 -07:00
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