raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,411 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

13411 Commits

Author SHA1 Message Date
springermac@gmail.com 4687d71c50 Fix traceback in mediacontroller if a service item had a processor type of automatic 
bzr-revno: 2573
 2015-12-13 22:59:45 +01:00
Tomas Groth 44a523631e Only import vlc in one place. Make it work with PyInstaller. 2015-12-13 21:35:23 +01:00
Samuel Mehrbrodt 0d4541b8dc Merge trunk 2015-12-11 09:33:24 +01:00
Jonathan Springer ec4ec887ea Fix CheckMedia player not stopping. 
Fix duration of zero on first play.
 2015-12-10 14:03:57 -05:00
Jonathan Springer fc3c433a21 Fix failing situation by making default_players a list instead of a string 2015-12-10 12:26:08 -05:00
Jonathan Springer 3108adff17 Add test for failing situation 2015-12-10 12:25:34 -05:00
Tim Bentley daee9916d6 Allow local stage views 
bzr-revno: 2572
 2015-12-07 22:09:22 +00:00
Jonathan Springer 50c0a173eb Add settings migration for phonon to system change 2015-12-07 16:41:15 -05:00
Jonathan Springer baa59f9321 Forgot to uncomment some code 2015-12-07 16:40:45 -05:00
Jonathan Springer 2e23d9919d Fix system player being used for live-background 2015-12-07 16:40:09 -05:00
Jonathan Springer ae4858e434 Fix traceback in mediacontroller if a service item had a processor type of automatic 2015-12-07 16:34:10 -05:00
Jonathan Springer f241aa663d Add test to reproduce traceback in mediacontroller 2015-12-07 16:31:46 -05:00
Tim Bentley 9a950ea4ab remove prints 2015-12-05 12:45:51 +00:00
Tim Bentley dcf97bf93b head 2015-12-05 12:45:01 +00:00
Tim Bentley ab18eaa051 fixes 2015-12-05 12:44:37 +00:00
Jonathan Springer 6b35a99775 merge trunk 2015-12-01 17:07:00 -05:00
springermac@gmail.com 08cf14c544 Fix projector tests by removing unneeded patch start calls 
bzr-revno: 2571
 2015-12-01 21:37:15 +00:00
Jonathan Springer 609f5a8512 Fix projector tests 2015-12-01 14:47:46 -05:00
Jonathan Springer 3b3c8a35b6 merge trunk 2015-11-29 17:57:37 -05:00
Jonathan Springer c964d968ca Update generate_resources.sh for PyQt5 2015-11-29 17:49:20 -05:00
Jonathan Springer 05a653e670 Make sure all generated pixmaps are show at the proper pixel ratio 2015-11-29 17:48:10 -05:00
Tim Bentley f1be12e941 Fix missing players when processing service items 
bzr-revno: 2570
 2015-11-29 13:41:29 +00:00
Tim Bentley 6a48bb5ac2 Style fixes 2015-11-28 20:13:16 +00:00
Tim Bentley 3a31f86e84 Head 2015-11-28 17:05:06 +00:00
Tim Bentley 64867b52a8 Add tests for Presentations 2015-11-28 17:04:46 +00:00
Tim Bentley 1ba8652985 Remove Prints 2015-11-28 15:38:31 +00:00
Tim Bentley ae1888106d Fix Presentations and Media 2015-11-28 15:37:26 +00:00
second@tgc.dk a3a5216734 Fix projector tests. 
Fix tests that fails on py35.

bzr-revno: 2569
 2015-11-27 17:27:55 +00:00
Tomas Groth a5525e96c1 Fix projector tests. 2015-11-26 21:44:19 +01:00
Tomas Groth be222ca597 Fix tests that fails on py35. 2015-11-25 22:47:56 +01:00
Tim Bentley db98c1c287 Fix bugs corrected in 2.2.1 
bzr-revno: 2568
 2015-11-23 21:36:36 +00:00
Jonathan Springer c37b033ba0 Fix typo in typo fix 2015-11-23 14:14:58 -05:00
Jonathan Springer 9e349b55f7 Fix typo 2015-11-23 14:04:10 -05:00
Jonathan Springer 7d3ec1ae24 Fix typo 2015-11-23 13:55:56 -05:00
Tim Bentley fba6767e79 fix old versions 2015-11-22 14:06:54 +00:00
Tim Bentley 78078fb2ed catchup late fixes from 2.2.1 2015-11-21 08:31:17 +00:00
Jonathan Springer d178aa1eec Fix tests 2015-11-20 14:30:46 -05:00
Jonathan Springer 4175b18507 Fix color button test 2015-11-16 23:58:30 -05:00
Jonathan Springer 9c46eda524 Enable and fix mimetype filters. 
Make sure file can be played due to lack of mimetype support on Linux and Windows
 2015-11-16 22:59:30 -05:00
Tim Bentley 4c7be1b5cf Remove \n for remotes posts to alerts to stop abends in maindisplay 
bzr-revno: 2567
 2015-11-16 21:01:03 +00:00
Tim Bentley a5a2b8b02b fix remote call data 2015-11-15 15:13:40 +00:00
Tim Bentley b4d7798300 fix join in tests 2015-11-08 21:23:15 +00:00
Tim Bentley ae21d548ba fix join 2015-11-08 21:19:54 +00:00
Tim Bentley 97e3eea173 and add tests 2015-11-08 21:07:48 +00:00
Tim Bentley 1ff9413d5a remove s 2015-11-08 20:23:16 +00:00
Tim Bentley 7299aae51c fix code 2015-11-08 20:19:02 +00:00
Jonathan Springer 285e12bc9d PEP8 2015-11-06 20:09:32 -05:00
Jonathan Springer 7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tim Bentley 19a2deef30 allow local remote views 2015-11-06 21:43:31 +00:00
tim.bentley@gmail.com 7c5add7fac First merge for 2.4. 
A Number of small bug fixes which could be done in 2.2.
Clean up all the 2.0 to 2.2 migrations stuff.
Create a 2.2 to 2.4 migration for settings.
Fix problems with the Tag test so you do not need to restart a branch each time we do a release.

lp:~trb143/openlp/bugs-2_4b (revision 2578)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1164/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1087/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1028/...

bzr-revno: 2566
Fixes: https://launchpad.net/bugs/913508, https://launchpad.net/bugs/1168778, https://launchpad.net/bugs/1281100, https://launchpad.net/bugs/1390699, https://launchpad.net/bugs/1390706, https://launchpad.net/bugs/1413217, https://launchpad.net/bugs/1420276, https://launchpad.net/bugs/1439304, https://launchpad.net/bugs/1487014
 2015-11-05 19:05:19 +00:00