raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
16,499 Commits 5 Branches 0 Tags 296 MiB
60a69f8666
Commit Graph

16499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel
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
Tomas Groth
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
John Morris
5677cf6a40 Changed plugin search clear ICON 2019-10-29 16:13:18 +00:00
Simon Hanna
722112cf23 Remove lint stage to speed up tests 2019-10-26 19:59:24 +02:00
Philip Ridout
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
Daniel
76ff4be598 Fix "Use default location" buttons 2019-10-26 10:00:07 +00:00
Philip Ridout
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
Daniel
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
Philip Ridout
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
Daniel
34eb93f565 Fix shadows toggle button 2019-10-26 09:37:20 +00:00
Raoul Snyman
2ace207485 Merge branch 'skip-pymupdf-tests-if-not-installed' into 'master' 
Do not test PyMuPDF if it's not installed

Closes #288

See merge request openlp/openlp!48
 2019-10-24 20:29:35 +00:00
Tim Bentley
3acd4569b9 Merge branch 'fix-text-alignment-on-display' into 'master' 
Fix text alignment on display

Closes #298

See merge request openlp/openlp!50
 2019-10-24 20:22:49 +00:00
Daniel
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
Simon Hanna
bc51c7ca7f Do not test PyMuPDF if it's not installed 
Fixes #288
 2019-10-24 19:56:08 +02: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
Daniel
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
Tim Bentley
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
John Morris
212d4c8678 Updated label for Copy and Custom Footer Text 2019-10-21 20:05:35 -04:00
Tim Bentley
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
Tim Bentley
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
Tim Bentley
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
Tim Bentley
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
Tim Bentley
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
Tim Bentley
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
Tim Bentley
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
Tomas Groth
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
Tomas Groth
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
John Kirkland
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
Tomas Groth
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
John Kirkland
e98dcb0d51 Resolved issue #281 2019-10-08 15:41:59 -05:00
Tim Bentley
fc71461a06 Merge branch 'liveworship' into 'master' 
LiveWorship importer

See merge request openlp/openlp!30
 2019-10-07 17:12:38 +00:00
Tomas Groth
1e8f72d49f LiveWorship importer 2019-10-07 17:12:38 +00:00
Tim Bentley
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
Tim Bentley
4b175c15b1 Fix name for script 
Signed-off-by: Tim <tim.bentley@gmail.com>
 2019-10-03 17:32:08 +00:00
Tim Bentley
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
Stoivo
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