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

15871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
df3bbc1ec0 fixes 2019-01-01 16:04:37 +00:00
Tim Bentley
7f799b09d2 fixes 2018-12-22 14:54:35 +00:00
Tim Bentley
9027e92e0f fixes 2018-12-22 14:42:19 +00:00
Tim Bentley
0037ae4b6d fixes 2018-12-22 14:38:04 +00:00
Tim Bentley
3bfa92cd47 fix bits 2018-12-21 15:42:12 +00:00
Tim Bentley
7be849681a fix bits 2018-12-21 15:33:46 +00:00