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

16249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Bentley
4547b7b4eb fix up tests 2019-02-12 19:55:08 +00:00
Philip Ridout
e62cfc64b8 Fix FTW tests 2019-02-11 21:21:22 +00:00
Tomas Groth
2219f1f65f Updated reveal.js to 3.7.0 2019-02-11 21:34:20 +01:00
Samuel Mehrbrodt
99f0d37253 Remove blank lines 2019-02-08 14:39:40 +01:00
Samuel Mehrbrodt
cf8feead1b Merge trunk 2019-02-08 12:22:39 +01:00
Philip Ridout
c7e4be5512 fix test 2019-02-07 19:38:11 +00:00
Kyle Nweeia
652b94e1ac Fixed bug #1678632 - SongSelect Importer Infinite Loop. 
bzr-revno: 2843
Fixes: https://launchpad.net/bugs/1678632
 2019-02-06 21:34:55 +01:00
Tomas Groth
2e93377cd3 Fix a few tests. 2019-02-06 21:26:33 +01:00
Philip Ridout
4ea2578cff Rework FTW to use ScreeenSelectionWizard 2019-02-06 20:07:01 +00:00
Tomas Groth
4489feb935 Added the text slide footer 2019-02-05 22:26:30 +01:00
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
4151c0b79f remove THIS 2019-02-03 09:19:04 +00:00
Tomas Groth
82fa94857f Fix pagination 2019-02-02 22:02:33 +01:00
Tim Bentley
8de6ff8832 Fixed trunk merge so now matches that. 2019-01-31 21:34:20 +01:00
Tomas Groth
128ae7948b Workaround for image thumbnails not being displayed correctly in the slidecontroller. 2019-01-30 21:11:32 +01:00
Raoul Snyman
62b0eedfc6 Get Pyro working again 2019-01-30 00:18:03 -07:00
Raoul Snyman
64251747fb HEAD 2019-01-29 10:27:34 -07:00
Tim Bentley
5c9e47d977 Add settings tab 2019-01-28 08:31:37 +00:00
Tomas Groth
728dcfba78 Fixed a traceback when saving in the screentab. 2019-01-27 21:01:02 +01:00
Tim Bentley
2f43ec5cf0 more fixes 2019-01-27 16:33:12 +00:00
Tim Bentley
2cae002824 cleanups 2019-01-27 14:52:06 +00:00
Tim Bentley
f1c7664125 Merge media trunk and fix up 2019-01-27 14:42:23 +00:00
Philip Ridout
af41798128 Make screen selection reusable 2019-01-26 08:17:07 +00:00
Tim Bentley
77f84e2b95 More stream stuff 2019-01-20 21:54:26 +00:00
Tim Bentley
469a888563 clean ups and settings 2019-01-20 17:58:41 +00:00
Tim Bentley
168efffb60 Move settings 2019-01-20 16:20:45 +00:00
Tim Bentley
8ed4216975 settings updates 2019-01-20 09:29:47 +00:00
Tim Bentley
4db5a94476 Refactor Media part 1, Add state management, bug fixes 
bzr-revno: 2842
 2019-01-20 07:39:40 +00:00
Raoul Snyman
28a920b540 Fix up some of the Javascript tests 2019-01-15 23:15:21 -07:00
Tim Bentley
59d61d6c9b fix 2019-01-11 20:23:24 +00:00
Tim Bentley
5b7beffe64 fix code 2019-01-10 22:01:07 +00:00
Tim Bentley
e39cad307b fix code 2019-01-10 21:20:44 +00:00
Tim Bentley
807e6a843d Fix doc strings 2019-01-08 19:30:28 +00:00
Tim Bentley
5299cc27f5 pep8 2019-01-04 20:50:40 +00:00
Tim Bentley
fb978fca99 pep8 2019-01-04 20:39:05 +00:00
Tim Bentley
588fc947c3 pep8 2019-01-04 20:30:34 +00:00
Tim Bentley
2f91548e72 pep8 2019-01-04 20:21:45 +00:00
Tim Bentley
392bfba099 pep8 2019-01-04 20:11:12 +00:00
Tim Bentley
953f0bae34 try again 2019-01-04 19:48:42 +00:00
Tim Bentley
f0e19b2a09 try again 2019-01-04 18:28:39 +00:00
Tim Bentley
9ded7b43f6 try again 2019-01-04 18:25:43 +00:00
Tim Bentley
c2a03e205d try again 2019-01-04 18:21:38 +00:00
Tim Bentley
26f549cd9e try again 2019-01-04 18:17:39 +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
f0108d89fc try again 2019-01-04 18:05:17 +00:00
Tim Bentley
4d6659e889 try again 2019-01-04 18:01:54 +00:00
Tim Bentley
da73e2f762 for fixes 2019-01-03 22:08:13 +00:00