Commit Graph

476 Commits

Author SHA1 Message Date
Phill
e81a97f582 PEP Fixes 2019-06-28 19:29:39 +01:00
Phill
f79e8803c9 Word of Worship file importer fixes / rework 2019-06-28 19:09:25 +01:00
Phill
5482e70e6d Break out json and path refactors from fixes branch 2019-05-22 07:47:00 +01:00
Bastian Germann
be1a398f7b License change to GPL-3.0-or-later 2019-04-13 15:00:22 +02:00
Samuel Mehrbrodt
68ebb22d17 Merge trunk 2019-04-08 23:03:57 +02:00
Phill
98f7c28d65 Add proxy settings to ftw. Option to skip sample data
bzr-revno: 2853
2019-03-28 22:03:32 +01:00
bddc3f02dc Just skip the darn test 2019-03-26 22:52:15 -07:00
Philip Ridout
07a61c57e6 HEAD 2019-03-09 06:59:19 +00:00
cc4b8e4242 PJLink2 Update U 2019-03-08 07:19:57 -08:00
Bob Luursema
490f9bbe15 Fix linting 2019-03-05 22:21:12 +01:00
Bob Luursema
c68d6dc3de Fixed bug 1800761 2019-03-05 21:55:37 +01:00
Bob Luursema
2a6378f489 Almost fixed bug 1800761 2019-03-04 21:37:11 +01:00
Philip Ridout
f3485513f1 Test and PEP8 fixes 2019-02-27 22:14:08 +00:00
Samuel Mehrbrodt
fcf4cb1c5c Merge trunk 2019-02-21 22:26:36 +01: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
Samuel Mehrbrodt
cf8feead1b Merge trunk 2019-02-08 12:22:39 +01: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
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
953f0bae34 try again 2019-01-04 19:48:42 +00:00
Kyle Nweeia
98bc575ba2 2018-12-13 20:46:55 -05:00
Kyle Nweeia
ea14f6cea8 2018-12-13 20:27:59 -05:00
Tomas Groth
e7526f1e59 merge trunk 2018-10-30 20:46:55 +01:00
Bastian Germann
191273fbe8 Remove unused imports 2018-10-27 13:05:41 +02:00
Bastian Germann
6aa998edd0 Replace PyICU with PyQt's QCollator
Use QCollator as new collator to get rid of the PyICU dependency.
Simplify the natural sorting with its numeric mode.
Simplify one test that is heavily dependent on implementation.
Run one sorting test on macOS which was disabled.
2018-10-27 12:50:15 +02:00
d1c4cea777 Fix linting issues 2018-10-26 18:40:20 -07:00
aa3b0c4bcc HEAD 2018-10-01 21:39:42 -07:00
37424b3b13 HEAD 2018-09-07 07:59:21 -07: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
b521b9aeba HEAD 2018-04-11 09:08:34 -07:00
Tim Bentley
2531e56910 Fix quotes 2018-03-09 21:58:45 +00:00
Tim Bentley
36276d4fac fix tests 2018-02-23 16:22:48 +00:00
7490c7ad1e HEAD 2018-01-13 17:55:21 -07:00
13885b1a39 HEAD 2018-01-03 23:10:20 -07:00
Tim Bentley
162742927e head fixes 2017-12-29 10:19:33 +00:00
Tim Bentley
41f35f52e3 End of 2017 2017-12-29 09:15:48 +00:00
Tim Bentley
f9e20e2108 tests 2017-12-28 08:22:55 +00:00
Phill Ridout
bbc1bf3732 few missed changes 2017-12-24 08:52:53 +00:00
Phill Ridout
a4054d3c2c Move song test resources to a 'song' sub directory'
A few other minor changes
2017-12-24 08:42:46 +00:00
Phill Ridout
cb53a266ce HEAD 2017-12-24 07:40:07 +00:00
Phill Ridout
5f1212b68e Pep8 2017-12-24 07:33:22 +00:00
Phill Ridout
d35e0329c3 More test fixes? 2017-12-24 07:15:50 +00:00
Tim Bentley
9e6ecb7272 fix errors 2017-12-24 07:11:30 +00:00
ca581d00bd HEAD 2017-12-23 14:53:54 -07:00
Tim Bentley
560467757a pep8 2017-12-23 09:30:02 +00:00
Tim Bentley
35d2ce263e finished 2017-12-23 09:22:53 +00:00
Tim Bentley
6729e78231 almost finished 2017-12-23 09:09:45 +00:00
Tim Bentley
17b62ee6c9 functional more bits 2017-12-23 07:55:26 +00:00
Phill Ridout
38c124224f more test tidy ups 2017-12-22 22:21:38 +00:00