Commit Graph

74 Commits

Author SHA1 Message Date
Tim Bentley 6ea3ac875c fix the fix! renderer not included any more 2019-02-04 17:21:34 +00:00
Tomas Groth 078c8d41eb Fix unresolved conflict - for real. 2019-02-03 21:45:24 +01:00
Tomas Groth aa5554a696 Fix unresolved conflict. 2019-02-03 21:44:46 +01:00
Tim Bentley 8de6ff8832 Fixed trunk merge so now matches that. 2019-01-31 21:34:20 +01:00
Tim Bentley f1c7664125 Merge media trunk and fix up 2019-01-27 14:42:23 +00:00
Tim Bentley 392bfba099 pep8 2019-01-04 20:11:12 +00:00
Tim Bentley c2a03e205d try again 2019-01-04 18:21:38 +00:00
Tim Bentley 7836aa4234 try again 2019-01-04 18:15:21 +00:00
Tim Bentley 72cd432f10 try again 2019-01-04 18:11:15 +00:00
Tim Bentley 4d6659e889 try again 2019-01-04 18:01:54 +00:00
Tim Bentley 0601c8e774 for fixes 2019-01-03 21:57:38 +00:00
Tim Bentley d1eff87c30 for fixes 2019-01-03 21:53:34 +00:00
Tim Bentley 83601e49be for fixes 2019-01-03 21:50:42 +00:00
Tim Bentley 64adcb9d06 for fixes 2019-01-03 21:43:16 +00:00
Tim Bentley 3ed5b214c6 for fixes 2019-01-03 21:37:26 +00:00
Tim Bentley 67badd0f29 for fixes 2019-01-03 21:34:03 +00:00
Tim Bentley 55ba43eae4 for fixes 2019-01-03 21:31:38 +00:00
Tim Bentley c177755136 for fixes 2019-01-03 21:21:41 +00:00
Tim Bentley 16c594365f for fixes 2019-01-03 21:12:53 +00:00
Tim Bentley 9a9ee4bafd for fixes 2019-01-03 21:00:21 +00:00
Tim Bentley 6780c64855 try again 2019-01-03 20:46:11 +00:00
Tim Bentley 100d72c571 remove unneeded 2019-01-03 20:39:53 +00:00
Tim Bentley 7f799b09d2 fixes 2018-12-22 14:54:35 +00:00
Tim Bentley 7be849681a fix bits 2018-12-21 15:33:46 +00:00
Tim Bentley c1a1ac58ba Fix tests and code 2018-12-02 09:03:01 +00:00
Raoul Snyman e58e0ee485 Fix all the tests 2018-11-30 22:52:49 -07:00
Tomas Groth 38c9514b80 Make tests runnable and clean up a bit 2018-10-30 21:12:16 +01:00
Tomas Groth e7526f1e59 merge trunk 2018-10-30 20:46:55 +01:00
Tomas Groth 4d8661b669 Improve service loading 2018-10-28 17:34:17 +01:00
Tim Bentley 26a9b2430d Head 2018-10-27 07:00:51 +01:00
Raoul Snyman d1c4cea777 Fix linting issues 2018-10-26 18:40:20 -07:00
Tim Bentley 1d4a414240 more state stuff 2018-10-20 15:41:32 +01:00
Raoul Snyman aa3b0c4bcc HEAD 2018-10-01 21:39:42 -07:00
Raoul Snyman 37424b3b13 HEAD 2018-09-07 07:59:21 -07:00
Raoul Snyman 67e6806924 HEAD, plus loading screens from settings 2018-09-06 23:43:01 -07: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
Phill Ridout 6a8bf83d27 Add cetralised proxy support
bzr-revno: 2823
2018-07-12 21:10:35 +01:00
Tomas Groth 318e90f893 Fixes for pycodestyle 2018-07-02 22:38:47 +02:00
Phill Ridout 2aaa0bf287 break out the code using multiple when/thens 2018-06-10 07:38:42 +01:00
Phill Ridout dce509e909 Add some forgetten files 2018-06-07 18:45:24 +01:00
Raoul Snyman a0d6f2d94a HEAD 2018-03-07 21:46:50 -07:00
Ken Roberts 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
Ken Roberts f1996d2cb7 PJLink2 Update P 2018-02-11 03:42:13 -08:00
Raoul Snyman 97172efba5 HEAD 2018-01-30 21:10:09 -07:00
Raoul Snyman 53ac8468d4 Fix copyright 2018-01-24 13:27:22 -07:00
Raoul Snyman 7490c7ad1e HEAD 2018-01-13 17:55:21 -07:00
Raoul Snyman d758ed257c Fix progress not showing in the FTW 2018-01-13 16:24:26 -07:00
Raoul Snyman 4fae7f829d Fix the tests I broke 2018-01-06 22:24:55 -07:00
Tim Bentley 162742927e head fixes 2017-12-29 10:19:33 +00:00