Raoul Snyman
3ab4c4533b
Merge branch 'small-fixes' into 'master'
...
Some small fixes
See merge request openlp/openlp!79
2019-11-20 18:52:17 +00:00
Raoul Snyman
1c4052c627
Some small fixes
...
- Convert the return value of 'keys' to a list so that we have an actual copy of it
- Always resolve the path returned by AppLocation
2019-11-20 18:52:16 +00:00
Raoul Snyman
e94f2b8134
Merge branch 'alpha_1a' into 'master'
...
Fix Media crash when blanking running media
See merge request openlp/openlp!81
2019-11-20 05:36:36 +00:00
02f41f794f
Try to fix paths in coverage report generation
...
- Add the local path to coverage config
- Fix the paths before generating an HTML report
2019-11-20 05:36:35 +00:00
Raoul Snyman
862a5e563f
Merge branch 'spelling' into 'master'
...
Corrected typos in 4 files
Closes #329
See merge request openlp/openlp!78
2019-11-15 16:26:08 +00:00
14b763d677
Corrected typos in 4 files
2019-11-15 16:26:08 +00:00
a7e7b1fb46
Merge branch 'translations-12112019' into 'master'
...
Update Translations as at 12112019
See merge request openlp/openlp!77
2019-11-13 17:25:01 +00:00
f63f7939ac
Try to fix paths in coverage report generation
...
- Add the local path to coverage config
- Fix the paths before generating an HTML report
2019-11-13 17:25:00 +00:00
Raoul Snyman
83c8a87ce2
Merge branch 'planningcenter_plugin' into 'master'
...
Planningcenter plugin
See merge request openlp/openlp!44
2019-11-09 16:17:41 +00:00
dbcdf11c0a
Planningcenter plugin
2019-11-09 16:17:41 +00:00
Raoul Snyman
b9e26a1cfb
Merge branch 'alpha_1' into 'master'
...
Media Fixes for Alpha 1
See merge request openlp/openlp!57
2019-11-03 21:17:47 +00:00
35f7190e00
Try to fix paths in coverage report generation
...
- Add the local path to coverage config
- Fix the paths before generating an HTML report
2019-11-03 21:17:47 +00:00
bf7b091db0
Merge branch 'fix-presentations-on-linux' into 'master'
...
Fix presentations on Linux (and hopefully Windows too)
Closes #269
See merge request openlp/openlp!75
2019-11-03 20:46:21 +00:00
Raoul Snyman
06339426d2
Fix presentations on Linux (and hopefully Windows too)
2019-11-03 20:46:21 +00:00
656a8479a9
Merge branch 'fix-clone-theme-background-missing-source' into 'master'
...
Fix clone theme with missing background source
Closes #322
See merge request openlp/openlp!70
2019-11-02 07:14:10 +00:00
1ac6c052c7
Fix clone theme with missing background source
2019-11-02 07:14:10 +00:00
1cc9fd9970
Merge branch 'force-display-screen' into 'master'
...
Force the display checkbox to be selected for at least 1 screen
See merge request openlp/openlp!73
2019-11-02 07:05:08 +00:00
Raoul Snyman
a019b42636
Force the display checkbox to be selected for at least 1 screen
2019-11-02 07:05:08 +00:00
Raoul Snyman
724f33c8ee
Merge branch 'ftw-autodetect-display' into 'master'
...
Pre-select a screen as the display if there is no screen config
Closes #302 , #276 , and #285
See merge request openlp/openlp!72
2019-11-02 06:21:23 +00:00
Raoul Snyman
f606838641
Pre-select a screen as the display if there is no screen config
...
- Force the last screen in the list to be the display screen by default
- Always select the first screen in the widget
- Increase the size of the FTW so that it stops jumping in size
- Add some more tests for the widgets
- Refactored widgets tests into a single file
- Fix #302 properly
2019-11-02 06:21:23 +00:00
cf675a7e7b
Merge branch 'fix-display-keypress-issues' into 'master'
...
Fix display keypress issues
Closes #323
See merge request openlp/openlp!71
2019-11-02 05:21:02 +00:00
a94449d8bc
Fix display keypress issues
2019-11-02 05:21:01 +00:00
db8e21fee4
Merge branch 'set-actions-on-display' into 'master'
...
Enable keyboard shortcuts for the display window
See merge request openlp/openlp!69
2019-11-01 20:49:15 +00:00
13dcff9aa7
Reuse the slidecontroller actions on the display window to enable
...
shortcuts to work for the display window. Fixes bug #286 .
2019-11-01 20:49:14 +00:00
b151d99274
Merge branch 'splashscreen2' into 'master'
...
Initial release of the test for SplashScreen.py
See merge request openlp/openlp!68
2019-11-01 15:44:53 +00:00
ecaa587e44
Initial release of the test for SplashScreen.py
2019-11-01 15:44:53 +00:00
99508388d1
Merge branch 'issue-302' into 'master'
...
Fix issue 302 with theme previews
Closes #302
See merge request openlp/openlp!63
2019-11-01 12:26:47 +00:00
Raoul Snyman
dd9701cb50
Fix issue #302 where theme previews were not being generated after the FTW
...
- Fix the theme preview generation to happen in the right place after the First Run Wizard
- Mock the settings in the DisplayWindow tests to see if that helps the Arch runner
- Add tests for the new form
2019-11-01 12:26:47 +00:00
0c6c457a45
Merge branch 'shortcut' into 'master'
...
Configure Custom shortcut error fix
Closes #321
See merge request openlp/openlp!65
2019-11-01 11:04:44 +00:00
2f94f35a42
Configure Custom shortcut error fix
2019-11-01 11:04:44 +00:00
Raoul Snyman
2d0254f45a
Merge branch 'fix-arch-tests' into 'master'
...
Fix the tests so that the Arch runner goes back to green
See merge request openlp/openlp!66
2019-10-31 20:40:19 +00:00
Raoul Snyman
8cc2e3af9d
Fix the tests so that the Arch runner goes back to green
2019-10-31 20:40:18 +00:00
a4e17d2bf9
Merge branch 'revert-9bc14eda' into 'master'
...
Revert "Merge branch 'appveyor-py38' into 'master'"
See merge request openlp/openlp!67
2019-10-31 20:34:25 +00:00
62e19eedd8
Revert "Merge branch 'appveyor-py38' into 'master'"
...
This reverts merge request !64
2019-10-31 20:34:25 +00:00
Raoul Snyman
9bc14edaae
Merge branch 'appveyor-py38' into 'master'
...
Update appveyor.yml to use python 3.8
See merge request openlp/openlp!64
2019-10-31 18:35:55 +00:00
da252680ce
Update appveyor.yml to use python 3.8
2019-10-31 18:35:55 +00:00
37e6a420e5
Merge branch 'allow-x11-override' into 'master'
...
Allow x11 override
Closes #316
See merge request openlp/openlp!61
2019-10-30 17:33:07 +00:00
cef0e67bd2
Allow x11 override
2019-10-30 17:33:07 +00:00
Raoul Snyman
60a69f8666
Merge branch 'remove-lint-stage' into 'master'
...
Remove lint stage to speed up tests
See merge request openlp/openlp!59
2019-10-29 22:58:30 +00:00
Raoul Snyman
c0314c8278
Merge branch 'fix-images-not-displaying' into 'master'
...
Fix display issues
Closes #307 and #313
See merge request openlp/openlp!60
2019-10-29 22:54:14 +00:00
61cf097d45
Revert "Don't load images twice"
...
This is beyond the scope of this branch, I would leave this in, but there is a lot of strange code including commented code in this file, so I'm leaving it out. It would be a better idea to fix the whole file in another branch (or Tim might be fixing this file with the media fixes)
2019-10-29 22:54:14 +00:00
eda847a8db
Merge branch 'search_icon' into 'master'
...
Changed plugin search clear ICON
Closes #315 and #267
See merge request openlp/openlp!58
2019-10-29 16:13:18 +00:00
5677cf6a40
Changed plugin search clear ICON
2019-10-29 16:13:18 +00:00
722112cf23
Remove lint stage to speed up tests
2019-10-26 19:59:24 +02:00
4408797e52
Merge branch 'fix-default-location-buttons' into 'master'
...
Fix "Use default location" buttons
Closes #306
See merge request openlp/openlp!53
2019-10-26 10:00:07 +00:00
76ff4be598
Fix "Use default location" buttons
2019-10-26 10:00:07 +00:00
4d395ee6e7
Merge branch 'new-rendering-engine-transitions' into 'master'
...
New rendering engine transitions
Closes #308
See merge request openlp/openlp!54
2019-10-26 09:57:00 +00:00
d2e31c26e9
Added new values to theme.json and added logic for ui
...
Also fixed normal speed not working and changed "Default" to "Normal" in the enums as it makes more sense.
2019-10-26 09:57:00 +00:00
1b9e68023e
Merge branch 'fix-shadows-toggle' into 'master'
...
Fix shadows toggle button
Closes #305
See merge request openlp/openlp!55
2019-10-26 09:37:20 +00:00
34eb93f565
Fix shadows toggle button
2019-10-26 09:37:20 +00:00
Raoul Snyman
Tim Bentley
John Morris
John Kirkland
Daniel
Tomas Groth
Philip Ridout
Simon Hanna