openlp

raoul/openlp

Fork 0

forked from openlp/openlp

Commit Graph

Select branches

Hide Pull Requests

2.0.x

2.2.x

2.4.x

add-woodpecker-ci

master

1.9.0

1.9.1

1.9.10

1.9.11

1.9.12

1.9.2

1.9.3

1.9.4

1.9.5

1.9.6

1.9.7

1.9.8

1.9.9

2.0

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.1.0

2.1.1

2.1.2

2.1.3

2.1.4

2.1.5

2.1.6

2.2

2.2.1

2.2.2

2.3.1

2.3.2

2.3.3

2.4

2.4.1

2.4.2

2.4.3

2.4.4

2.4.5

2.4.6

2.5

2.9.0

2.9.1

2.9.2

2.9.3

2.9.4

66f19e05a1 Merge branch 'fix-cached-theme-background-management' into 'master' Raoul Snyman 2019-10-23 22:54:30 +0000
c0aa199ac3 Add background_source to Theme and use it in the theme wizard Daniel 2019-10-23 22:54:29 +0000
1a2aabf8a4 Merge branch 'display-tests' into 'master' Tim Bentley 2019-10-23 20:09:37 +0000
5b7e628403 Run the Display JS tests as well Raoul Snyman 2019-10-23 20:09:37 +0000
3d1af40823 Merge branch 'printservicelabels' into 'master' Raoul Snyman 2019-10-23 04:22:28 +0000
212d4c8678 Updated label for Copy and Custom Footer Text John Morris 2019-10-21 20:05:35 -0400
1e82419f1b

Merge branch 'master' of gitlab.com:openlp/openlp Tim 2019-10-18 17:59:43 +0100
846a77cae7 Merge branch 'skip-tests' into 'master' Tim Bentley 2019-10-18 16:54:00 +0000
1c4224e3d7 Skip certain tests if we're running on GitLab or AppVeyor Raoul Snyman 2019-10-18 16:54:00 +0000
6eb81e2f61

Create a Theme Preview dialog, plus some theme background fixes. Raoul Snyman 2019-10-18 06:12:09 +0000
d98b84bd26

Set up a GitLab runner on a Windows 7 VM, and configure the pipeline to use it. Raoul Snyman 2019-10-16 20:10:33 -0700
0fd6710075

Try to fix paths in coverage report generation Raoul Snyman 2019-10-15 16:21:37 +0000
26d263bc71 Merge branch 'theme-progress-dialog' into 'master' Tim Bentley 2019-10-18 06:12:10 +0000
99d2ec7715 Create a Theme Preview dialog, plus some theme background fixes. Raoul Snyman 2019-10-18 06:12:09 +0000
362a775a55 Merge branch 'test-windows' into 'master' Tim Bentley 2019-10-17 11:03:39 +0000
555bfb5f88

Set up a GitLab runner on a Windows 7 VM, and configure the pipeline to use it. Raoul Snyman 2019-10-16 20:10:33 -0700
92206d1677 Merge branch 'fix-combine-coverage' into 'master' Tim Bentley 2019-10-15 16:21:37 +0000
6ac63522a5 Try to fix paths in coverage report generation Raoul Snyman 2019-10-15 16:21:37 +0000
9d709745dd Merge branch 'combine-coverage' into 'master' Tim Bentley 2019-10-11 18:48:27 +0000
ba0056dd75 Run coverage on both Linux and macOS Raoul Snyman 2019-10-11 18:48:27 +0000
63a4a1d3a6 Merge branch 'editorconfig' into 'master' Tim Bentley 2019-10-10 15:28:16 +0000
1e76868a23 Remove vim lines from files and add a .editorconfig for editors that support it Raoul Snyman 2019-10-10 15:28:16 +0000
bf3201003d Merge branch 'publish-coverage' into 'master' Tim Bentley 2019-10-10 15:26:56 +0000
ff1b2dab63 Publish the coverage report, plus bug fixes. Raoul Snyman 2019-10-10 15:26:56 +0000
4172838a3e Merge branch 'MediaClipSelectorForm_timer_causing_tests_to_fail' into 'master' Tomas Groth 2019-10-09 08:28:10 +0000
41d7166b89 Merge branch 'bible_search_from_gui_not_working' into 'master' Tomas Groth 2019-10-09 08:27:28 +0000
a129485805 Resolved issue #282 by deleting the get_books function in HTTPBible, allowing it to use the on in the parent class, BibleImport. John Kirkland 2019-10-09 08:27:28 +0000
5c3ea6f918 Merge branch 'bug-280' into 'master' Tomas Groth 2019-10-09 08:26:42 +0000
a1a101793d Fix issue #280 where the constructor was not accepting the custom_geometry argument Raoul Snyman 2019-10-09 08:26:42 +0000
e98dcb0d51 Resolved issue #281 John Kirkland 2019-10-08 15:41:59 -0500
fc71461a06 Merge branch 'liveworship' into 'master' Tim Bentley 2019-10-07 17:12:38 +0000
1e8f72d49f LiveWorship importer Tomas Groth 2019-10-07 17:12:38 +0000
efbadec78d Merge branch 'test-in-arch' into 'master' Tim Bentley 2019-10-06 06:09:33 +0000
0e7631a87f Test on Arch Linux too Raoul Snyman 2019-10-06 06:09:33 +0000
3c8f17f3ab Merge branch 'i18n_changes' into 'master' Raoul Snyman 2019-10-03 17:32:08 +0000
4b175c15b1 Fix name for script Tim Bentley 2019-10-03 17:32:08 +0000
bd0646b174 Merge branch 'sort_authors_on_export' into 'master' Tim Bentley 2019-10-01 20:58:20 +0000
6e640fe7a5 Sort the authors when exporting the songs Stoivo 2019-10-01 20:58:20 +0000
4693bd2b3c Merge branch 'allow-search-by-song-number' into 'master' Tim Bentley 2019-09-26 20:49:05 +0000
c6ed9e6a01 Allow searching by Song Number Mat 2019-09-26 20:49:05 +0000
3fef98fced Merge branch 'use-docker-hub' into 'master' Tim Bentley 2019-09-26 16:54:38 +0000
877b858fa3 Use the Docker runner images on Docker Hub Raoul Snyman 2019-09-26 16:54:38 +0000
4d7145af02 Merge branch 'add-coverage' into 'master' Tim Bentley 2019-09-26 16:38:09 +0000
739530d67c Add test coverage for reporting to GitLab Raoul Snyman 2019-09-26 16:38:09 +0000
5666d8ea1f Merge branch 'gitlab-appveyor' into 'master' Tomas Groth 2019-09-25 18:00:05 +0000
81900c7f83 Update and move appveyor.yml so that it will work with the new gitlab setup. Tomas Groth 2019-09-25 18:00:05 +0000
d691b12ab2 Merge branch 'fix-typo' into 'master' Tomas Groth 2019-09-24 18:17:43 +0000
7332716191 Fix typo Simon Hanna 2019-09-23 22:07:46 +0200
a7b2e4143f Merge branch 'bzr2git' into 'master' Tomas Groth 2019-09-21 14:13:48 +0000
527a70ed41 Merge branch 'missing-resources' into 'master' Tomas Groth 2019-09-21 14:03:19 +0000
f576b93774 Revert "Fix: add missing resources.py" Andreas P 2019-09-21 14:03:19 +0000
1a756def20 Replace launchpad references Bastian Germann 2019-09-21 00:47:38 +0200
1fe14b66f1 Remove pylintrc Bastian Germann 2019-09-20 23:27:49 +0200
9941aaac16 Replace mention of pylint by flake8 Bastian Germann 2019-09-20 23:27:31 +0200
95a056e504 Remove some pylint occurences Bastian Germann 2019-09-18 23:35:47 +0200
7e4a586a97 Synchronize dependencies Bastian Germann 2019-09-18 23:32:50 +0200
28f359281f Remove dead code Bastian Germann 2019-09-18 00:02:12 +0200
9f8181723d Generate .version from git Bastian Germann 2019-09-17 22:23:35 +0200
ab19467c0b Merge branch 'test_fixes' into 'master' Tim Bentley 2019-09-21 06:22:42 +0000
cdba0e9235 Merge branch 'media_sept_19' into 'master' Raoul Snyman 2019-09-21 04:56:43 +0000
3e5dfdb730 Add initial cleanup files for media fixes. Tim Bentley 2019-09-21 04:56:43 +0000
b141b899ec Merge remote-tracking branch 'fork/test_fixes' into test_fixes Benjamin Hoving 2019-09-19 20:12:37 -0400
3271e15401 Merge remote-tracking branch 'upstream/master' into test_fixes Benjamin Hoving 2019-09-19 20:07:44 -0400
b571fdb0f7 Merge branch 'fix-macos-ci' into 'master' Tomas Groth 2019-09-19 08:52:59 +0000
f80127a3a1 Update macOS CI configuration to update the $PATH Raoul Snyman 2019-09-19 08:52:59 +0000
f3f0f6404e delete test_git_tags (test_bzr_tags) Benjamin Hoving 2019-09-18 18:09:49 -0400
9cc2d4a5af Merge remote-tracking branch 'upstream/master' into test_fixes Benjamin Hoving 2019-09-18 14:59:50 -0400
dd9e6765fc Merge branch 'fix-gitlab-ci' into 'master' Tomas Groth 2019-09-18 18:29:05 +0000
c1933352ea Ignore some generated files, make generate resources script check for an existing file; ignore pdfcontroller test for now Raoul Snyman 2019-09-18 18:29:05 +0000
808ee8ed2d cleanup/flake8 Benjamin Hoving 2019-09-18 13:14:12 -0400
1a582f2345 Merge branch 'master' into test_fixes Benjamin Hoving 2019-09-18 12:49:58 -0400
0a3995a60d Merge branch 'gitlab-ci-pylint' into 'master' Raoul Snyman 2019-09-18 16:44:39 +0000
1da59bef0d Create a linting stage Benjamin Hoving 2019-09-18 16:44:39 +0000
f7d12d2280 Merge branch 'cherry-pick-1d3f54b5' into 'master' Raoul Snyman 2019-09-18 16:28:27 +0000
c68a28e539 typo and remove historyboxcombo test file Benjamin Hoving 2019-09-18 11:51:17 -0400
107c9a1b52 git tag tests Benjamin Hoving 2019-09-18 11:34:55 -0400
e0fc84f218 remove test_bzr_tags Benjamin Hoving 2019-09-17 19:20:15 -0400
04a70ac59e remove test_pylint Benjamin Hoving 2019-09-17 19:20:04 -0400
df0f630ebe Another unneeded file tim.bentley@gmail.com 2019-09-17 21:22:09 +0000
92c381c25e Merge branch 'remove-launchpad-scripts' into 'master' Tim Bentley 2019-09-17 21:07:23 +0000
df98624b34 Merge branch 'ditch-docker-for-now' into 'master' Tim Bentley 2019-09-17 20:27:44 +0000
5f78bbb6bf

Ditch the Docker images for now Raoul Snyman 2019-09-17 13:18:08 -0700
413b101c90 Merge branch 'first-request' into 'master' Raoul Snyman 2019-09-17 17:12:46 +0000
4e391741a9

Update translation files Tim Bentley 2019-09-17 17:51:18 +0100
eaa52837d4 Fix: remove lp-merge script as it is not needed any longer Andreas Preikschat 2019-09-17 11:02:57 +0200
00e44faba9 Merge branch 'add-gitlab-ci' into 'master' Tim Bentley 2019-09-17 07:52:51 +0000
ef4367321d Merge branch 'add-gitignore' into 'master' Tim Bentley 2019-09-17 07:51:14 +0000
45bc57b32f Merge branch 'rename-readme' into 'master' Tim Bentley 2019-09-17 07:45:26 +0000
aeec68c603 Rename readme Raoul Snyman 2019-09-17 07:45:26 +0000
0fbb14f84e

Moved and updated .bzrignore into .gitignore Raoul Snyman 2019-09-16 23:44:52 -0700
3c9c531884

Restrict macOS to master on the main project Raoul Snyman 2019-09-16 23:41:16 -0700
2ae1a279c1

Added GitLab CI configuration Raoul Snyman 2019-09-16 22:20:23 -0700
9d16ae2b06 Based on ic90's code, this just simplifies some of the code, and streamlines how things work, plus a couple of CSS fixes. Raoul Snyman 2019-09-15 17:22:22 +0200
262726f777 Forgot to update to latest CSS when updating RevealJS to 3.8.0. Tomas Groth 2019-09-15 16:27:59 +0200
c2273d8d96 Forgot to update to latest CSS when updating RevealJS to 3.8.0. Tomas Groth 2019-09-15 14:44:01 +0200
cb2ccac22c Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well Raoul Snyman 2019-09-14 08:27:40 +0100
a77bb78e6e Add Importer SingingTheFaith john+ubuntu@paladyn.org 2019-09-14 08:26:59 +0100
8983324ed5 Remove some old, commented out code. Raoul Snyman 2019-09-13 14:34:18 -0700
25a7c6f5b3 Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well Raoul Snyman 2019-09-12 23:09:19 -0700
ccc9b2a7c1 Fix a linting issue Raoul Snyman 2019-09-12 15:54:09 -0700