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

16610 Commits

Author SHA1 Message Date
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
Tim Bentley 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
Mat c6ed9e6a01 Allow searching by Song Number 2019-09-26 20:49:05 +00:00
Tim Bentley 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
Tim Bentley 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
Tomas Groth 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
Tomas Groth 81900c7f83 Update and move appveyor.yml so that it will work with the new gitlab setup. 2019-09-25 18:00:05 +00:00
Tomas Groth d691b12ab2 Merge branch 'fix-typo' into 'master' 
Fix typo

See merge request openlp/openlp!24
 2019-09-24 18:17:43 +00:00
Simon Hanna 7332716191 Fix typo 2019-09-23 22:31:45 +02:00
Tomas Groth 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
Tomas Groth 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
Andreas P f576b93774 Revert "Fix: add missing resources.py" 
This reverts commit 9aa7206489.
 2019-09-21 14:03:19 +00:00
Bastian Germann 1a756def20 Replace launchpad references 2019-09-21 13:15:11 +02:00
Bastian Germann 1fe14b66f1 Remove pylintrc 2019-09-21 13:14:23 +02:00
Bastian Germann 9941aaac16 Replace mention of pylint by flake8 2019-09-21 13:14:23 +02:00
Bastian Germann 95a056e504 Remove some pylint occurences 2019-09-21 13:14:23 +02:00
Bastian Germann 7e4a586a97 Synchronize dependencies 2019-09-21 13:14:23 +02:00
Bastian Germann 28f359281f Remove dead code 2019-09-21 13:14:23 +02:00
Bastian Germann 9f8181723d Generate .version from git 2019-09-21 13:14:23 +02:00
Tim Bentley ab19467c0b Merge branch 'test_fixes' into 'master' 
test_fixes

See merge request openlp/openlp!13
 2019-09-21 06:22:42 +00:00
Raoul Snyman cdba0e9235 Merge branch 'media_sept_19' into 'master' 
Media sept 19

See merge request openlp/openlp!21
 2019-09-21 04:56:43 +00:00
Tim Bentley 3e5dfdb730 Add initial cleanup files for media fixes. 
Signed-off-by: Tim <tim.bentley@gmail.com>
 2019-09-21 04:56:43 +00:00
Benjamin Hoving b141b899ec Merge remote-tracking branch 'fork/test_fixes' into test_fixes 2019-09-19 20:12:37 -04:00
Benjamin Hoving 3271e15401 Merge remote-tracking branch 'upstream/master' into test_fixes 2019-09-19 20:07:44 -04:00
Tomas Groth b571fdb0f7 Merge branch 'fix-macos-ci' into 'master' 
Update macOS CI configuration to update the $PATH

See merge request openlp/openlp!18
 2019-09-19 08:52:59 +00:00
Raoul Snyman f80127a3a1 Update macOS CI configuration to update the $PATH 2019-09-19 08:52:59 +00:00
Benjamin Hoving f3f0f6404e delete test_git_tags (test_bzr_tags) 2019-09-18 18:09:49 -04:00
Benjamin Hoving 9cc2d4a5af Merge remote-tracking branch 'upstream/master' into test_fixes 2019-09-18 14:59:50 -04:00
Tomas Groth dd9e6765fc Merge branch 'fix-gitlab-ci' into 'master' 
Fix GitLab CI configuration

See merge request openlp/openlp!17
 2019-09-18 18:29:05 +00:00
Raoul Snyman c1933352ea Ignore some generated files, make generate resources script check for an existing file; ignore pdfcontroller test for now 2019-09-18 18:29:05 +00:00
Benjamin Hoving 808ee8ed2d cleanup/flake8 2019-09-18 13:18:15 -04:00
Benjamin Hoving 1a582f2345 Merge branch 'master' into test_fixes 2019-09-18 12:49:58 -04:00
Raoul Snyman 0a3995a60d Merge branch 'gitlab-ci-pylint' into 'master' 
lint ci stage

See merge request openlp/openlp!14
 2019-09-18 16:44:39 +00:00
Benjamin Hoving 1da59bef0d Create a linting stage 2019-09-18 16:44:39 +00:00
Raoul Snyman f7d12d2280 Merge branch 'cherry-pick-1d3f54b5' into 'master' 
Removed the Launchpad Merge Proposal script.

See merge request openlp/openlp!15
 2019-09-18 16:28:27 +00:00
Benjamin Hoving c68a28e539 typo and remove historyboxcombo test file 2019-09-18 11:58:23 -04:00
Benjamin Hoving 107c9a1b52 git tag tests 2019-09-18 11:34:55 -04:00
Benjamin Hoving e0fc84f218 remove test_bzr_tags 2019-09-17 19:20:15 -04:00