471ab7923d
Use flexbox to align stuff
...
I don't know what you would need it for, but the manual position setting in the theme currently only works for the footer, won't be a hassle to do for main though.
2019-10-24 20:22:49 +00:00
Raoul Snyman
66f19e05a1
Merge branch 'fix-cached-theme-background-management' into 'master'
...
Fix cached theme background management
Closes #145 and #301
See merge request openlp/openlp!49
2019-10-23 22:54:30 +00:00
c0aa199ac3
Add background_source to Theme and use it in the theme wizard
...
The theme wizard (while editing a theme) now changes both background_source and background_filename then sets filename to the new cache location on apply (also added the filename_source var to Theme). The new var is needed so when the user goes to change the theme again, they see the file they selected, not the cached one. This commit fixes the issue of changing theme backgrounds not deleting the cached file but deleting the original file.
2019-10-23 22:54:29 +00:00
1a2aabf8a4
Merge branch 'display-tests' into 'master'
...
Run the Display JS tests as well
See merge request openlp/openlp!52
2019-10-23 20:09:37 +00:00
Raoul Snyman
5b7e628403
Run the Display JS tests as well
...
- Add an entry in .gitlab-ci.yml
- Create a custom browser that'll run in Docker with Chromium Headless
- Add JS linting
- Fix up issues highlighted by linter
2019-10-23 20:09:37 +00:00
Raoul Snyman
3d1af40823
Merge branch 'printservicelabels' into 'master'
...
Updated Print Service labels for Copy and Custom Footer Text
Closes #270
See merge request openlp/openlp!51
2019-10-23 04:22:28 +00:00
212d4c8678
Updated label for Copy and Custom Footer Text
2019-10-21 20:05:35 -04:00
846a77cae7
Merge branch 'skip-tests' into 'master'
...
Skip certain tests if we're running on GitLab or AppVeyor
See merge request openlp/openlp!46
2019-10-18 16:54:00 +00:00
Raoul Snyman
1c4224e3d7
Skip certain tests if we're running on GitLab or AppVeyor
2019-10-18 16:54:00 +00:00
26d263bc71
Merge branch 'theme-progress-dialog' into 'master'
...
Create a Theme Preview dialog, plus some theme background fixes
Closes #283 and #299
See merge request openlp/openlp!45
2019-10-18 06:12:10 +00:00
Raoul Snyman
99d2ec7715
Create a Theme Preview dialog, plus some theme background fixes.
...
- Update .gitignore to ignore virtualenvs and eggs directory
- Create a dialog to generate theme previews/thumbnails
- Use theme preview generation dialog all over
- Create a test for the new method
- Update existing theme manager tests
- Skip Bible HTTP tests when in GitLab CI
- Make theme backgrounds scale and centred
2019-10-18 06:12:09 +00:00
362a775a55
Merge branch 'test-windows' into 'master'
...
Set up a GitLab runner on a Windows 7 VM, and configure the pipeline to use it.
See merge request openlp/openlp!43
2019-10-17 11:03:39 +00:00
Raoul Snyman
555bfb5f88
Set up a GitLab runner on a Windows 7 VM, and configure the pipeline to use it.
2019-10-16 22:13:26 -07:00
92206d1677
Merge branch 'fix-combine-coverage' into 'master'
...
Try to fix paths in coverage discovery
See merge request openlp/openlp!41
2019-10-15 16:21:37 +00:00
Raoul Snyman
6ac63522a5
Try to fix paths in coverage report generation
...
- Add the local path to coverage config
- Fix the paths before generating an HTML report
2019-10-15 16:21:37 +00:00
9d709745dd
Merge branch 'combine-coverage' into 'master'
...
Run coverage on both Linux and macOS
Closes #284
See merge request openlp/openlp!40
2019-10-11 18:48:27 +00:00
Raoul Snyman
ba0056dd75
Run coverage on both Linux and macOS
2019-10-11 18:48:27 +00:00
63a4a1d3a6
Merge branch 'editorconfig' into 'master'
...
Remove vim lines from files and add a .editorconfig for editors that support it
See merge request openlp/openlp!38
2019-10-10 15:28:16 +00:00
Raoul Snyman
1e76868a23
Remove vim lines from files and add a .editorconfig for editors that support it
2019-10-10 15:28:16 +00:00
bf3201003d
Merge branch 'publish-coverage' into 'master'
...
Publish coverage, plus bug fixes
Closes #48 and #64
See merge request openlp/openlp!39
2019-10-10 15:26:56 +00:00
Raoul Snyman
ff1b2dab63
Publish the coverage report, plus bug fixes.
...
- Default theme level to Global, as per #48
- Make song delete message make more sense, fixes #64
- Publish the coverate report to OpenLP's GitLab page
2019-10-10 15:26:56 +00:00
4172838a3e
Merge branch 'MediaClipSelectorForm_timer_causing_tests_to_fail' into 'master'
...
MediaClipSelectorForm 100ms timer causing tests to fail intermittently
Closes #281
See merge request openlp/openlp!35
2019-10-09 08:28:10 +00:00
41d7166b89
Merge branch 'bible_search_from_gui_not_working' into 'master'
...
Bible search from gui not working
Closes #281 and #282
See merge request openlp/openlp!36
2019-10-09 08:27:28 +00:00
a129485805
Resolved issue #282 by deleting the get_books function in HTTPBible,
...
allowing it to use the on in the parent class, BibleImport.
2019-10-09 08:27:28 +00:00
5c3ea6f918
Merge branch 'bug-280' into 'master'
...
Fix issue #280 where the constructor was not accepting the custom_geometry argument
Closes #280
See merge request openlp/openlp!37
2019-10-09 08:26:42 +00:00
Raoul Snyman
a1a101793d
Fix issue #280 where the constructor was not accepting the custom_geometry argument
2019-10-09 08:26:42 +00:00
e98dcb0d51
Resolved issue #281
2019-10-08 15:41:59 -05:00
fc71461a06
Merge branch 'liveworship' into 'master'
...
LiveWorship importer
See merge request openlp/openlp!30
2019-10-07 17:12:38 +00:00
1e8f72d49f
LiveWorship importer
2019-10-07 17:12:38 +00:00
efbadec78d
Merge branch 'test-in-arch' into 'master'
...
Test on Arch Linux too
See merge request openlp/openlp!34
2019-10-06 06:09:33 +00:00
Raoul Snyman
0e7631a87f
Test on Arch Linux too
2019-10-06 06:09:33 +00:00
Raoul Snyman
3c8f17f3ab
Merge branch 'i18n_changes' into 'master'
...
Update ts files and add script to generate qm files if needed.
See merge request openlp/openlp!32
2019-10-03 17:32:08 +00:00
4b175c15b1
Fix name for script
...
Signed-off-by: Tim <tim.bentley@gmail.com>
2019-10-03 17:32:08 +00:00
bd0646b174
Merge branch 'sort_authors_on_export' into 'master'
...
Sort the authors when exporting the songs
See merge request openlp/openlp!7
2019-10-01 20:58:20 +00:00
6e640fe7a5
Sort the authors when exporting the songs
...
I export all our songs and store it in git so I know what changes and can revert
if someone change incorrectly.
2019-10-01 20:58:20 +00:00
4693bd2b3c
Merge branch 'allow-search-by-song-number' into 'master'
...
Allow searching by Song Number
See merge request openlp/openlp!26
2019-09-26 20:49:05 +00:00
c6ed9e6a01
Allow searching by Song Number
2019-09-26 20:49:05 +00:00
3fef98fced
Merge branch 'use-docker-hub' into 'master'
...
Use the Docker runner images on Docker Hub
See merge request openlp/openlp!27
2019-09-26 16:54:38 +00:00
Raoul Snyman
877b858fa3
Use the Docker runner images on Docker Hub
2019-09-26 16:54:38 +00:00
4d7145af02
Merge branch 'add-coverage' into 'master'
...
Add test coverage for reporting to GitLab
See merge request openlp/openlp!28
2019-09-26 16:38:09 +00:00
Raoul Snyman
739530d67c
Add test coverage for reporting to GitLab
2019-09-26 16:38:09 +00:00
5666d8ea1f
Merge branch 'gitlab-appveyor' into 'master'
...
Update and move appveyor.yml so that it will work with the new gitlab setup.
See merge request openlp/openlp!23
2019-09-25 18:00:05 +00:00
81900c7f83
Update and move appveyor.yml so that it will work with the new gitlab setup.
2019-09-25 18:00:05 +00:00
d691b12ab2
Merge branch 'fix-typo' into 'master'
...
Fix typo
See merge request openlp/openlp!24
2019-09-24 18:17:43 +00:00
7332716191
Fix typo
2019-09-23 22:31:45 +02:00
a7b2e4143f
Merge branch 'bzr2git' into 'master'
...
Remove some bzr and pylint occurences
See merge request openlp/openlp!11
2019-09-21 14:13:48 +00:00
527a70ed41
Merge branch 'missing-resources' into 'master'
...
Fix: add missing resources.py
See merge request openlp/openlp!4
2019-09-21 14:03:19 +00:00
f576b93774
Revert "Fix: add missing resources.py"
...
This reverts commit 9aa7206489
2019-09-21 14:03:19 +00:00
1a756def20
Replace launchpad references
2019-09-21 13:15:11 +02:00
1fe14b66f1
Remove pylintrc
2019-09-21 13:14:23 +02:00
Daniel
Raoul Snyman
Tim Bentley
John Morris
Tomas Groth
John Kirkland
John Kirkland
Stoivo
Mat
Simon Hanna
Andreas P
Bastian Germann