Commit Graph

16221 Commits

Author SHA1 Message Date
Philip Ridout
9b2ef7d8f7 PEP8 2019-02-15 20:47:09 +00:00
Tomas Groth
85b40c5024 another try 2019-02-15 21:33:18 +01:00
Tomas Groth
7ec703a7d7 try out appveyor changes 2019-02-15 21:25:37 +01:00
Philip Ridout
6d7c19256b Fixes 2019-02-15 20:22:02 +00:00
Philip Ridout
8bc6cfc1a5 HEAD 2019-02-15 20:12:59 +00:00
Philip Ridout
097225c9d7 Code change for json config file. Titulate themes ftw page 2019-02-15 20:12:28 +00:00
Tomas Groth
aa982492e4 Implement going to the previous serviceitem. 2019-02-15 20:33:43 +01:00
Tomas Groth
b10aa24119 Attempt to fix appveyor tests 2019-02-14 22:19:26 +01:00
Tomas Groth
ad0eacd4f0 merge trunk 2019-02-14 20:49:32 +01:00
Tim Bentley
fc579f120a Head 2 2019-02-14 19:42:34 +00:00
Tim Bentley
c0d328dc06 Head 2019-02-14 19:40:35 +00:00
Tomas Groth
ff20f53618 Updated copyright headers to 2019
bzr-revno: 2845
2019-02-14 19:29:14 +00:00
Tomas Groth
fa4ec96054 Updated to 2019 in copyright headers 2019-02-14 16:09:09 +01:00
d99c2f6996 Migration from WebKit to Webengine. Also introduced reveal.js for slide rendering, new screen setup dialogs and many other changes.
bzr-revno: 2844
2019-02-14 00:04:30 -07:00
fe397290f2 HEAD 2019-02-13 14:38:20 -07:00
465ff767d6 Fix an unused import and some incorrect patch()s 2019-02-13 14:36:37 -07:00
Tim Bentley
63cceb262c remove unused 2019-02-13 21:34:00 +00:00
Tomas Groth
5ac8bbc3f2 Even more pep8 fixes and removed the old htmlbuilder. 2019-02-13 22:19:24 +01:00
Tomas Groth
27f37df7e8 More pep8 fixes 2019-02-13 21:54:35 +01:00
Tomas Groth
31ed94d88c pep8 fixes 2019-02-13 21:28:10 +01:00
Tomas Groth
927b68dc95 Fix more tests 2019-02-13 20:41:10 +01:00
Tim Bentley
6b4ed77fee fix up tests 2019-02-12 20:55:58 +00:00
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
62b0eedfc6 Get Pyro working again 2019-01-30 00:18:03 -07:00
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