Commit Graph

2710 Commits

Author SHA1 Message Date
Kyle Russell
8a5a2628dc Fix pycodestyle line spacing warnings 2018-08-31 20:27:53 -04:00
Kyle Russell
6dc1c37d59 Merge lp:openlp for manifest test resources and font fix 2018-08-31 13:35:30 -04:00
c2a60fb0e9 Make our version number PEP 440 compliant and add a script for Jenkins to report back to a merge proposal.
bzr-revno: 2833
2018-08-31 16:46:54 +01:00
8d379e6785 Add some tests, we're up to 52% coverage now! 2018-08-30 22:49:26 -07:00
Kyle Russell
c366e58683 Improve usability of image plugin choosegroupform
In order to add an image to an existing group when no group was preselected,
the user must currently choose the existing group name from the comboxbox
and also select the Existing Group radio button.  It should be assumed that
by selecting a group name from the combobox, the user intendeds to add the
image to an existing group, and the accompanying radio button should
automatically be selected.  This reduces the number of required clicks, and
the likelihood of not actually adding the image to the correct group.

Likewise, if a user enters text into the New Group field, the dialog
should assume that the user's intent is to create a new group and auto
select the appropriate radio button.

Also removes some choosegroupdialog specific component logic from mediaitem,
since it's now covered by the choosegroupdialog implementation.  Better
encapsulation, and improves testability. (Testing that the existing group
radio button was selected when choosedialogform was initialized with a
preselected group requires much more effort when the radio button selection
logic spanned two components.)

Adds simple test cases for the scenarios described above.
2018-08-29 23:11:30 -04:00
Simon Hanna
7321810e78 Improve the regex, removing the displayed warning 2018-08-27 16:16:26 +02:00
Simon Hanna
aaef55106c Remove imports from openlp/core/ui/__init__.py and update related files 2018-08-25 16:36:46 +02:00
Simon Hanna
a4c1e306b5 Remote imports from openlp/core/lib/__init__.py and update other files accordingly 2018-08-25 16:08:19 +02:00
Simon Hanna
3e5eb698d9 Return None instead of raising an error when converting path objects 2018-08-12 13:12:03 +02:00
Tomas Groth
0aadec661f Fix some pylint failures and add qtawesome to appveyor install. 2018-08-05 22:28:01 +02:00
Tim Bentley
3a0d0ff2ea Head 2018-08-04 21:58:13 +01:00
edada54d7e Fix windows not using lo as network interface 2018-08-03 15:32:32 -07:00
Tim Bentley
023753b2fc fix tests 2018-07-15 20:54:41 +01:00
Phill Ridout
6a8bf83d27 Add cetralised proxy support
bzr-revno: 2823
2018-07-12 21:10:35 +01:00
Tomas Groth
e3d163bf7a Remove debug print 2018-07-06 22:23:33 +02:00
Tomas Groth
ac14c0186d fix pylint test 2018-07-05 22:33:07 +02:00
Tomas Groth
588cf96b5a Fix a test 2018-07-05 21:18:16 +02:00
Tomas Groth
56a811c094 More pycodestyle fixes 2018-07-04 22:42:55 +02:00
Tomas Groth
318e90f893 Fixes for pycodestyle 2018-07-02 22:38:47 +02:00
Tim Bentley
c064259e7e fix up after projector merge 2018-06-28 21:40:54 +01:00
bc832c7c72 PJLink2 update S 2018-06-28 08:37:37 -07:00
Tim Bentley
51f8eaa911 add tests 2018-06-27 22:01:30 +01:00
Tim Bentley
5c26cf8cf0 fixes 2018-06-26 20:44:54 +01:00
Tim Bentley
13f52e96db new tree 2018-06-26 18:08:36 +01:00
Tim Bentley
b6dc37fb0b remove more and fix code 2018-06-10 20:29:00 +01:00
Phill Ridout
2aaa0bf287 break out the code using multiple when/thens 2018-06-10 07:38:42 +01:00
Phill Ridout
94758a9778 Pep 2018-06-08 07:21:23 +01:00
Phill Ridout
fac5d4b798 Fixes 2018-06-08 07:12:23 +01:00
Phill Ridout
dce509e909 Add some forgetten files 2018-06-07 18:45:24 +01:00
Phill Ridout
6f34f8f2b8 Start on implementing global OpenLP proxying 2018-06-07 18:44:35 +01:00
991b2880bf PJLink2 update R 2018-05-03 07:58:50 -07:00
604581c71a PJLink2 update Q 2018-04-19 23:04:43 -07:00
Simon Hanna
de8cbc55d6 Fix comment 2018-04-17 12:27:38 +02:00
Simon Hanna
a2b86384a7 Add requested changes 2018-04-15 15:59:40 +02:00
Simon Hanna
255b1efe3a Fix bug where newlines where stripped when normalizing string 2018-04-14 21:52:28 +02:00
b521b9aeba HEAD 2018-04-11 09:08:34 -07:00
Tim Bentley
f4667d8614 remove comments 2018-04-06 16:52:08 +01:00
Tim Bentley
006fdae0de fix segfault 2018-04-05 17:29:34 +01:00
Tim Bentley
eae164f041 fix up the auth tests 2018-03-31 08:51:39 +01:00
Tim Bentley
01ae5247d3 start to test the http wrappers 2018-03-29 22:15:56 +01:00
Tim Bentley
819d5d830d Add a load of tests 2018-03-29 20:52:59 +01:00
Tim Bentley
127f1dc7fd fix up tests 2018-03-29 18:22:02 +01:00
Tim Bentley
c6076e1054 start to add tests 2018-03-29 18:10:29 +01:00
Tim Bentley
fada29080c fix a bit of the tests 2018-03-29 17:25:10 +01:00
Tim Bentley
db0f131e15 Add the removal of the version code part 1 2018-03-29 16:54:55 +01:00
Tim Bentley
cc688ea21d add tests 2018-03-18 18:18:17 +00:00
Tim Bentley
2531e56910 Fix quotes 2018-03-09 21:58:45 +00:00
Tim Bentley
0130e7fc09 fix test 2018-03-08 21:22:53 +00:00
Tim Bentley
c02ea46582 fix test 2018-03-08 21:19:38 +00:00
a0d6f2d94a HEAD 2018-03-07 21:46:50 -07:00
Tim Bentley
619d7ce839 add tests 2018-02-23 16:55:17 +00:00
Tim Bentley
36276d4fac fix tests 2018-02-23 16:22:48 +00:00
Tim Bentley
5696655768 Fix up text 2018-02-20 22:03:32 +00:00
8e5fb217d3 - manager: Remove unused signal disconnect projectorNetwork.disconnect()
- Change PJLinkUDP.pjlink_udp_commands to dict with link to processing methods
- Add test_projector_pjlink_udp.test_process_ackn_duplicate
- Add test_projector_pjlink_udp.test_process_ackn_multiple
- Add test_projector_pjlink_udp.test_process_ackn_single
- Add test_projector_pjlink_udp.test_process_srch
- Add PJLinkUDP.get_datagram method
- Add PJLinkUDP._trash_udp_buffer method
- Add PJLinkUDP.process_ackn method
- Add ...

bzr-revno: 2813
2018-02-16 21:09:49 +00:00
ed347492e9 Move MY_IP4 dict to get_local_ip4 function 2018-02-11 13:52:04 -08:00
f1996d2cb7 PJLink2 Update P 2018-02-11 03:42:13 -08:00
Tim Bentley
008581267a add missing files 2018-02-03 14:41:18 +00:00
Tim Bentley
7f39fe90d1 head 2018-02-03 14:07:07 +00:00
Tim Bentley
7de71a1939 pep8 2018-02-03 13:53:14 +00:00
Tim Bentley
6a1edd6dc7 add new test 2018-02-03 12:59:01 +00:00
Tim Bentley
f7169ee708 remove ppt viewer 2018-02-02 21:33:41 +00:00
97172efba5 HEAD 2018-01-30 21:10:09 -07:00
Tim Bentley
c9ff4b2209 fix web api 2018-01-27 09:41:11 +00:00
1f53453ff6 Fixed an issue with the FTW not displaying any download progress.
Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~raoul-snyman/openlp/fix-ftw-download-progress (revision 2811)
https://ci.openlp.io/job/Branch-01-Pull/2430/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2331/                  [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/125/                   [SUCCESS]
https:/...

bzr-revno: 2811
2018-01-24 21:36:15 +00:00
53ac8468d4 Fix copyright 2018-01-24 13:27:22 -07:00
James Muscat
7539483959 Use point size for text outline.
The previous code matched the erroneous behaviour of the original Python method, which used `em` as a measurement; the theme wizard uses `pt` as a unit and doesn't allow fractional values, which meant that it was not possible to specify very thin outlines at large font sizes.

Now, both UI and rendering code use `pt` as a unit, which allows thin outlines.
2018-01-21 11:07:04 -07:00
James Muscat
bbadd9fbce Use pt for outline size.
This matches the units used in the theme settings UI, and allows thin outlines
to be used with large font sizes.
2018-01-21 13:08:24 +00:00
Phill Ridout
7ced39594f Add test 2018-01-19 21:00:56 +00:00
Phill Ridout
89042982d6 HEAD 2018-01-16 20:49:18 +00:00
7490c7ad1e HEAD 2018-01-13 17:55:21 -07:00
331554a038 HEAD 2018-01-13 17:45:24 -07:00
d6087813ae - Ongoing conversions from self.asserts to plain asserts
- Remove test_ part of method name for bugfix tests no longer used
- Move tests *_change_status_* from pjlink_commands_01 to pjlink_base
- Move test projector_reset_information from pjlink_commands_01 to pjlink_commands_02
- Move lamp_nonstandard_reply from bugfix to pjlink_commands_01
- Move clss_nonstandard_reply 1/2 from bugfix to pjlink_commands_01
- Move test_projector_get_* tests from pjlink_commands_01 to pjlink_base
- Added pjli...

bzr-revno: 2809
2018-01-13 17:44:36 -07:00
d758ed257c Fix progress not showing in the FTW 2018-01-13 16:24:26 -07:00
Phill Ridout
c88a08f9e4 HEAD 2018-01-13 07:25:07 +00:00
Phill Ridout
2095a00dc9 Fix up code so test passes 2018-01-13 07:24:20 +00:00
17ff6a7d31 PJLink2 update o 2018-01-12 21:41:42 -08:00
11f528d09c Change is_thread_finished() to return True if a thread is missing 2018-01-12 22:24:53 -07:00
83bc19520a Removed a duplicate test file, fixed up some tests, added some more tests 2018-01-12 21:57:16 -07:00
6f9f68a99b Add some more tests for openlp.core.api.deploy 2018-01-12 16:45:06 -07:00
ff421df2bf Fix bug #1742910
Fixes: https://launchpad.net/bugs/1742910
2018-01-12 11:29:32 -07:00
c5b7b46a55 Fix the tests I now added back in 2018-01-07 11:07:22 -07:00
7e99381dba Fix some issues highlighted by Tim and Phill, and added a file that was erroneously removed 2018-01-07 10:50:29 -07:00
4fae7f829d Fix the tests I broke 2018-01-06 22:24:55 -07:00
13885b1a39 HEAD 2018-01-03 23:10:20 -07:00
f1575dd50b Updated various thread usages 2018-01-03 23:01:35 -07:00
d97ca9e54b Merge trunk 2018-01-02 16:35:14 -08:00
Simon Hanna
399b40745d Fixed the version checking to be more robust
* Strip the response so empty responses that contain whitespace are in fact empty
* Change http to https to result in one less query
* Add test for responses containing white space
* Add .cache to bzrignore (generated by pytest when tests fail)

bzr-revno: 2805
2018-01-02 21:00:54 +00:00
Simon Hanna
9c45e4afdf Add test for fix 2017-12-29 11:38:51 +01:00
Tim Bentley
162742927e head fixes 2017-12-29 10:19:33 +00:00
Tim Bentley
2edfe63a59 pep8 2017-12-29 10:02:13 +00:00
Tim Bentley
8997fc07e0 ci fixes 2017-12-29 09:40:15 +00:00
Tim Bentley
41f35f52e3 End of 2017 2017-12-29 09:15:48 +00:00
Tim Bentley
367f8f9315 add missing text 2017-12-28 09:34:04 +00:00
Tim Bentley
b503634e7c missing copyrights 2017-12-28 08:31:35 +00:00
Tim Bentley
cfc487d623 tests 2017-12-28 08:27:44 +00:00
Tim Bentley
f9e20e2108 tests 2017-12-28 08:22:55 +00:00
33da95371f Cleanups and assert updates 2017-12-25 20:14:39 -08:00
598a373929 PJLink Updates N 2017-12-25 00:44:30 -08:00
Phill Ridout
bbc1bf3732 few missed changes 2017-12-24 08:52:53 +00:00
Phill Ridout
a4054d3c2c Move song test resources to a 'song' sub directory'
A few other minor changes
2017-12-24 08:42:46 +00:00
Phill Ridout
b87a797b39 Move song test resource files 2017-12-24 08:22:41 +00:00
Phill Ridout
cb53a266ce HEAD 2017-12-24 07:40:07 +00:00
Phill Ridout
5f1212b68e Pep8 2017-12-24 07:33:22 +00:00
Phill Ridout
d35e0329c3 More test fixes? 2017-12-24 07:15:50 +00:00
Tim Bentley
9e6ecb7272 fix errors 2017-12-24 07:11:30 +00:00
Phill Ridout
f6e3f03fca Fixed tests? 2017-12-23 23:45:10 +00:00
ca581d00bd HEAD 2017-12-23 14:53:54 -07:00
Tim Bentley
560467757a pep8 2017-12-23 09:30:02 +00:00
Tim Bentley
35d2ce263e finished 2017-12-23 09:22:53 +00:00
Tim Bentley
5e9a73ca9f almost finished 2017-12-23 09:10:43 +00:00
Tim Bentley
6729e78231 almost finished 2017-12-23 09:09:45 +00:00
Tim Bentley
17b62ee6c9 functional more bits 2017-12-23 07:55:26 +00:00
Phill Ridout
a866bc5499 Test fixes 2017-12-22 22:35:09 +00:00
Phill Ridout
38c124224f more test tidy ups 2017-12-22 22:21:38 +00:00
Tim Bentley
aee4f76093 functional more bits 2017-12-22 22:20:04 +00:00
Phill Ridout
3bdf6d0bd6 HEAD 2017-12-22 21:21:39 +00:00
Phill Ridout
c3c1f1dc66 Test tidy ups 2017-12-22 21:20:49 +00:00
Tim Bentley
e9b4d2d7be functional more bits 2017-12-22 21:16:06 +00:00
Tim Bentley
19918d0aa9 functional more bits 2017-12-22 21:04:29 +00:00
Tim Bentley
e17386d5ab functional more bits 2017-12-22 17:51:59 +00:00
Tim Bentley
1abc6e6316 functional more bits 2017-12-22 17:15:30 +00:00
Tim Bentley
dd53bfd157 functional bibles 2017-12-22 16:53:40 +00:00
Tim Bentley
9843d48478 bible tests and head 2017-12-22 15:50:45 +00:00
Tim Bentley
0ed4ac5224 more assert updates and py.test fixes
py.test now runs on the whole test without major errors.

lp:~trb143/openlp/asserts (revision 2826)
https://ci.openlp.io/job/Branch-01-Pull/2371/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2272/              [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2132/               [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1458/                [SUCCESS]
https://ci.openlp.io/job/Branch-04...

bzr-revno: 2799
2017-12-22 15:11:30 +00:00
Tim Bentley
ed3d92d818 Fix tests and make pytest run clean 2017-12-22 10:45:39 +00:00
Phill
2db71e57c0 Number of fixes, including:
* Fix to creation and saving of services
* SongBeamer encoding detection
* OSX plugin, media and presentation controller discovery and import fixes
* Make the ftw thread work in its own thread, rather than the main thread


lp:~phill-ridout/openlp/fixes-V (revision 2801)
https://ci.openlp.io/job/Branch-01-Pull/2351/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2252/              [WAITING]
[RUNNING]
[SUCC...

bzr-revno: 2798
2017-12-21 20:23:26 +00:00
Tim Bentley
bb25804165 more ui bits 2017-12-20 21:18:44 +00:00
Tim Bentley
ffb23a4575 more ui bits 2017-12-20 20:38:43 +00:00
Tim Bentley
e055ed65a3 start ui 2 2017-12-20 17:44:52 +00:00
Tim Bentley
66d450464b start ui 2017-12-20 17:37:58 +00:00
Tim Bentley
d87d8181df pep8 2017-12-20 17:30:39 +00:00
Tim Bentley
8e69c65b09 ui media done 2017-12-20 17:24:56 +00:00
2fa88b17db Refactor threads to use new openlp.core.threading module 2017-12-20 07:17:07 -07:00
Tim Bentley
8f0779f600 Start media 2017-12-20 08:15:53 +00:00
Tim Bentley
5764551e3e fix up widgets 2017-12-19 19:47:02 +00:00
Tim Bentley
2ccec6088d buttons and app 2017-12-19 19:22:47 +00:00
Phill Ridout
590f44e212 HEad 2017-12-18 19:59:35 +00:00
Phill Ridout
7c39bcda97 Finish tests 2017-12-18 19:57:13 +00:00
Tim Bentley
054e6e08b0 Fixes 2017-12-18 17:10:04 +00:00
Tim Bentley
c2215d1a1e lib done pep 8 2017-12-17 20:19:19 +00:00
Tim Bentley
f76f04994d lib done 2017-12-17 17:52:17 +00:00
Tim Bentley
9f735e0cc5 1 more done 2017-12-17 15:35:35 +00:00
Phill Ridout
e9f4637895 Impress tests 2017-12-17 15:28:21 +00:00
Tim Bentley
fbaeca26f2 2 more done 2017-12-17 14:12:27 +00:00
9bbd3fa72d Add threading tests 2017-12-17 00:45:40 -07:00
d75b3f3ef1 Add some tests for threading, and fix a problem in a test related to the threading change 2017-12-17 00:25:29 -07:00
Phill Ridout
f629504b5b Mostly minor path tidy-ups 2017-12-17 04:29:53 +00:00
Tim Bentley
efe7129f21 fixes 2017-12-16 08:43:33 +00:00
Tim Bentley
eb20838046 fixes 2017-12-15 16:30:10 +00:00
Tim Bentley
ca936f5e1a fixes 2017-12-15 16:19:42 +00:00
213dc6a25c Fix mainwindow tests 2017-12-14 10:48:58 -07:00
9a14750d65 HEAD 2017-12-11 13:25:58 -07:00
Tim Bentley
c25a446839 Finish common again 2017-12-09 16:37:26 +00:00
Tim Bentley
ac95f4e3ca Finish common 2017-12-09 16:29:58 +00:00
Tim Bentley
17b70f0c0a Fix tests 2017-12-09 16:11:45 +00:00
Tim Bentley
595ae30cd4 Fix tests 2017-12-09 15:39:31 +00:00
Tim Bentley
0c8217f33c Fix tests 2017-12-09 15:34:16 +00:00
Tim Bentley
ed2b87aed3 Fix tests 2017-12-09 15:32:05 +00:00
Tim Bentley
3a9d2f6a61 Fix test 2017-12-09 15:28:09 +00:00
Tim Bentley
02df3149c7 First attempt 2 2017-12-09 15:21:59 +00:00
Tim Bentley
d2ba2ad599 First attempt 2017-12-09 15:00:39 +00:00
63aa4927a5 - Added pjlink.process_pjlink
- Split pjlink.check_login() to use process_pjlink()
- Added QAbstractSocket connect enum to constants
- Minor code cleanups for connection and command processing
- Updated packet queueing
- Fix get_object_filtered()
- Fix tests in test_projector_pjlink_base
- Fix tests in test_projector_pjlink_cmd_routing
- Added tests for process_pjlink method
- Updated test_projector_bugfixes_01
- Some OLP style cleanups

-------------------------------------------------------...

bzr-revno: 2795
2017-12-09 14:47:23 +00:00
eec0e325df OLP Style cleanups 2017-12-09 03:17:05 -08:00
44b82d8ca2 Fix mocks to use correct python version tests 2017-12-04 16:54:15 -08:00
Phill Ridout
baed193444 PEP8 2017-12-04 20:49:59 +00:00
Phill Ridout
4374200ab0 Test fixes 2017-12-04 20:32:02 +00:00
159056f06f PJLink2-M updates 2017-12-03 16:24:47 -08:00
Phill Ridout
7043a20530 Few test fixes 2017-12-02 22:10:22 +00:00
Tim Bentley
70d2d73171 missed test name 2017-12-02 10:52:13 +00:00
Tim Bentley
0a695ea7e6 fix tests 2017-12-02 09:37:55 +00:00
Tim Bentley
4f882c460b fix tests 2017-12-02 09:31:13 +00:00
f69757a59d Fix up the tests 2017-12-01 22:31:23 -07:00
c7ea4c460e Fix up some stuff around the screen list 2017-12-01 17:35:21 -07:00
64a245bef9 HEAD 2017-12-01 14:58:34 -07:00
ba392da665 Skip locale test on macOS until we can figure it out 2017-11-30 17:31:48 -07:00
b3669c4f5d Change things around a bit 2017-11-30 15:46:03 -07:00
d9e2994deb Actually run the function, ID10T 2017-11-30 15:29:41 -07:00
8fa9bdcf58 Skip the test if not on Linux 2017-11-30 15:15:11 -07:00
b650ef5730 Refactor mocks 2017-11-24 11:08:23 -08:00
2b9d2a994b Bugfix 1734275 Nonstandard LAMP reply 2017-11-24 00:30:37 -08:00
Phill Ridout
bd2efc8ec0 PEP8 2017-11-21 07:23:02 +00:00
Phill Ridout
97e6e759bd test fix 2017-11-21 07:15:05 +00:00
Phill Ridout
7d0b841269 tidyups 2017-11-20 21:57:34 +00:00
Phill Ridout
1b168dd7bf More pathlib refactors 2017-11-18 23:14:28 +00:00
Phill Ridout
a79ec45055 HEAD 2017-11-18 22:40:05 +00:00
ecaf678a55 - Move openlp.core.lib.projector to openlp.core.projectors
- Move openlp.core.ui.projector to openlp.core.projectors
- Move tests.functional.openlp_core/lib/test_projector* to tests.functional.openlp.core.projectors
- Fix imports for new projector location
- Convert projector imports to fully-qualified import
- Fix delete projector item in ui.manager
- Fix projector tests
- Merge trunk (fix tests)
- Rename "Projector" dock to "Projector Controller"
--------------------------------------------...

bzr-revno: 2789
2017-11-18 22:25:36 +00:00
Phill Ridout
9196db5af0 Pathlib refactors and test fixes 2017-11-18 11:23:15 +00:00
c46cd951ef Projector imports to fully-qualified, renamed projector dock 2017-11-16 15:53:53 -08:00
Phill
71eaccb547 Various fixes
lp:~phill-ridout/openlp/fixes-mkIII (revision 2794)
https://ci.openlp.io/job/Branch-01-Pull/2301/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2202/              [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2080/               [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1406/                [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/B...

bzr-revno: 2788
2017-11-16 18:52:59 +00:00
fad67f7339 Add some more tests 2017-11-15 22:03:19 -07:00
0bef29758c HEAD 2017-11-15 20:52:11 -07:00
Phill
1d1195d732 Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~phill-ridout/openlp/pathlib9 (revision 2783)
https://ci.openlp.io/job/Branch-01-Pull/2286/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2187/              [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2068/               [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch...

bzr-revno: 2786
2017-11-15 20:51:52 -07:00
Phill Ridout
35e13022a6 image media test fixes 2017-11-15 18:33:21 +00:00
8c3fd99ed5 Fix missing line 2017-11-15 00:03:35 -07:00
d05e39fc70 Fix up test after merges 2017-11-14 23:55:57 -07:00
d50029c636 Merge trunk 2017-11-14 16:19:49 -08:00
1c10227c38 HEAD 2017-11-14 17:01:57 -07:00
e5c9b7c98e Merge from upstream 2017-11-14 17:01:19 -07:00
1cb11832bd Added some tests for the settings upgrade and fixed a bug I had introduced. 2017-11-14 00:19:10 -07:00
Phill Ridout
9606b99976 Fix md5 thumbnail regression
Fixes: https://launchpad.net/bugs/1692187
2017-11-13 20:07:20 +00:00