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
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
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
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
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
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
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
aeec68c603
Rename readme
2019-09-17 07:45:26 +00:00
0fbb14f84e
Moved and updated .bzrignore into .gitignore
2019-09-16 23:44:52 -07:00
3c9c531884
Restrict macOS to master on the main project
2019-09-16 23:41:16 -07:00
2ae1a279c1
Added GitLab CI configuration
2019-09-16 22:20:23 -07:00
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
Tomas Groth
c2273d8d96
Forgot to update to latest CSS when updating RevealJS to 3.8.0.
2019-09-15 14:44:01 +02:00
cb2ccac22c
Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well
...
bzr-revno: 2902
2019-09-14 08:27:40 +01:00
john+ubuntu@paladyn.org
a77bb78e6e
Add Importer SingingTheFaith
...
bzr-revno: 2901
2019-09-14 08:26:59 +01:00
8983324ed5
Remove some old, commented out code.
2019-09-13 14:34:18 -07:00
25a7c6f5b3
Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well
2019-09-12 23:09:19 -07:00
ccc9b2a7c1
Fix a linting issue
2019-09-12 15:54:09 -07:00
671abe1def
Fix the queued alerts not being displayed
2019-09-12 15:39:57 -07:00
4f9a1b4e0b
Minor cosmetic fixes to remove the "<2>" from the app title in KDE:
...
- Name the display window "Display Window"
- Name the threads dialog "Please Wait"
- Also fix potential issue where threads remove themselves from the dictionary at shutdown and cause an error.
bzr-revno: 2900
2019-09-12 17:04:39 +01:00
3b87327682
Fix all the tests
2019-09-11 23:06:35 -07:00
83cd5c1a88
HEAD
2019-09-11 21:41:43 -07:00
3af3068027
Fix alerts to scroll properly, and simplify how everything works
2019-09-11 21:41:30 -07:00
Bastian Germann
22ae2d66b5
Use start script __main__.py which enables 'python -m openlp'
...
bzr-revno: 2899
2019-09-11 21:08:27 -07:00
