openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity
16,643 Commits 6 Branches 56 Tags 311 MiB
Commit Graph

16643 Commits

Author SHA1 Message Date
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
Benjamin Hoving 04a70ac59e remove test_pylint 2019-09-17 19:20:04 -04:00
tim.bentley@gmail.com df0f630ebe Another unneeded file 
Signed-off-by: Tim <tim.bentley@gmail.com>


(cherry picked from commit 1d3f54b5ec584e2a811c157a8adb640ddb2d24b1)
 2019-09-17 21:26:03 +00:00
Tim Bentley 92c381c25e Merge branch 'remove-launchpad-scripts' into 'master' 
Fix: remove lp-merge script as it is not needed any longer

See merge request openlp/openlp!5
 2019-09-17 21:07:23 +00:00
Tim Bentley df98624b34 Merge branch 'ditch-docker-for-now' into 'master' 
Ditch the Docker images for now

See merge request openlp/openlp!10
 2019-09-17 20:27:44 +00:00
Raoul Snyman 5f78bbb6bf
Ditch the Docker images for now 2019-09-17 13:18:08 -07:00
Raoul Snyman 413b101c90 Merge branch 'first-request' into 'master' 
Update translation files

See merge request openlp/openlp!6
 2019-09-17 17:12:46 +00:00
Tim Bentley 4e391741a9
Update translation files 
Signed-off-by: Tim <tim.bentley@gmail.com>
 2019-09-17 17:51:18 +01:00
Andreas Preikschat eaa52837d4 Fix: remove lp-merge script as it is not needed any longer 2019-09-17 11:02:57 +02:00
Tim Bentley 00e44faba9 Merge branch 'add-gitlab-ci' into 'master' 
Added GitLab CI configuration

See merge request openlp/openlp!2
 2019-09-17 07:52:51 +00:00
Tim Bentley ef4367321d Merge branch 'add-gitignore' into 'master' 
Moved and updated .bzrignore into .gitignore

See merge request openlp/openlp!3
 2019-09-17 07:51:14 +00:00
Tim Bentley 45bc57b32f Merge branch 'rename-readme' into 'master' 
Rename readme

See merge request openlp/openlp!1
 2019-09-17 07:45:26 +00:00
Raoul Snyman aeec68c603 Rename readme 2019-09-17 07:45:26 +00:00
Raoul Snyman 0fbb14f84e
Moved and updated .bzrignore into .gitignore 2019-09-16 23:44:52 -07:00
Raoul Snyman 3c9c531884
Restrict macOS to master on the main project 2019-09-16 23:41:16 -07:00
Raoul Snyman 2ae1a279c1
Added GitLab CI configuration 2019-09-16 22:20:23 -07:00
Raoul Snyman 9d16ae2b06 Based on ic90's code, this just simplifies some of the code, and streamlines how things work, plus a couple of CSS fixes. 
bzr-revno: 2904
 2019-09-15 17:22:22 +02:00
Tomas Groth 262726f777 Forgot to update to latest CSS when updating RevealJS to 3.8.0. 
bzr-revno: 2903
 2019-09-15 16:27:59 +02:00