Commit Graph

506 Commits

Author SHA1 Message Date
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
Tim Bentley
aee4f76093 functional more bits 2017-12-22 22:20:04 +00:00
Phill Ridout
3bdf6d0bd6 HEAD 2017-12-22 21:21:39 +00:00
Phill Ridout
c3c1f1dc66 Test tidy ups 2017-12-22 21:20:49 +00:00
Tim Bentley
e9b4d2d7be functional more bits 2017-12-22 21:16:06 +00:00
Tim Bentley
19918d0aa9 functional more bits 2017-12-22 21:04:29 +00:00
Tim Bentley
e17386d5ab functional more bits 2017-12-22 17:51:59 +00:00
Tim Bentley
1abc6e6316 functional more bits 2017-12-22 17:15:30 +00:00
Tim Bentley
dd53bfd157 functional bibles 2017-12-22 16:53:40 +00:00
Tim Bentley
ed3d92d818 Fix tests and make pytest run clean 2017-12-22 10:45:39 +00:00
d75b3f3ef1 Add some tests for threading, and fix a problem in a test related to the threading change 2017-12-17 00:25:29 -07:00
9a14750d65 HEAD 2017-12-11 13:25:58 -07:00
c7ea4c460e Fix up some stuff around the screen list 2017-12-01 17:35:21 -07:00
b3669c4f5d Change things around a bit 2017-11-30 15:46:03 -07:00
d9e2994deb Actually run the function, ID10T 2017-11-30 15:29:41 -07:00
8fa9bdcf58 Skip the test if not on Linux 2017-11-30 15:15:11 -07:00
Phill Ridout
7d0b841269 tidyups 2017-11-20 21:57:34 +00:00
8b34852236 Rename some tests so that they can be picked up by nose2; Fix some patches that were wrong; Fix a bug in our code that the now running tests picked up 2017-10-28 23:01:25 -07:00
15a4a93c96 Phase 2 complete 2017-10-10 00:08:44 -07:00
bc0ade07e0 HEAD 2017-10-09 19:29:56 -07:00
b406cfd5a8 Phase 1 complete 2017-10-07 00:05:07 -07:00
Tim Bentley
b07f2e9f86 head 2017-10-01 21:11:03 +01:00
Philip Ridout
70e50f4aaa Pep fixes 2017-09-30 23:45:24 +01:00
Philip Ridout
ab49b8b8ad pathlib changes for song plugin 2017-09-30 21:16:30 +01:00
Tim Bentley
7abef1df22 fix lables and render bug 2017-08-27 18:13:14 +01:00
Tim Bentley
bc03652cda Finish tests 2017-08-11 17:09:14 +01:00
Tim Bentley
7bcaec2cb3 start of the tests 2017-08-09 06:15:10 +01:00
Samuel Mehrbrodt
f5f4226891 PEP8 fixes 2017-06-12 20:09:50 +02:00
Samuel Mehrbrodt
885a1bad01 Merge trunk 2017-06-12 20:04:49 +02:00
Samuel Mehrbrodt
5fbcbb3047 Fix test 2017-06-12 20:04:17 +02:00
Philip Ridout
c0f2a9a777 HEAD 2017-06-09 07:06:49 +01:00
Johannes Thomas Meyer
0850351237 implemented fix suggestions 2017-06-05 23:41:29 +02:00
Samuel Mehrbrodt
f89d7992fa PEP8 fixes, cleanup, added two more placeholders for footer template, added last_or_penultimate flag in list 2017-06-04 15:42:21 +02:00
Samuel Mehrbrodt
66c9f8eb82 made use of pystache for footer generation being configurable in song settings
- removed now obsolete and via template better configurable options to display "songbook", "written by" and "copyright" information in footer
- added explanation box for so far used settings as pystache placeholders
- added songs configuration setting for template including reset button
- added default template replacing currently existing configuration as best as possible (should be backwards compatible or at least be adaptable to correspond to former settings)
- adjusted tests to new and removed functionality

Fixes: https://launchpad.net/bugs/1695620
2017-06-04 01:31:47 +02:00
Philip Ridout
2915a8f0e7 Head 2017-06-01 07:18:47 +01:00
Tomas Groth
ad55a8d254 Fix issue where enable-chord settings was not setup correctly for tests. 2017-05-30 22:06:27 +02:00
Philip Ridout
b2f5f2e9e2 test fixes 2017-05-30 20:40:01 +01:00
Philip Ridout
a4ffbce6c3 HEAD 2017-05-30 19:50:39 +01:00
Philip Ridout
a24d5f8f15 TODO's TODOne, and a few other cleanups 2017-05-30 19:42:35 +01:00
Gary Talent
549ec886a5 Add support for importing EasyWorship 6 databases
bzr-revno: 2741
Fixes: https://launchpad.net/bugs/1675641
2017-05-22 12:07:07 -07:00
Tomas Groth
5988f1c56a Fixed an issue and added a test. 2017-05-17 22:06:45 +02:00
Tomas Groth
798093adfe trunk 2017-05-11 22:24:20 +02:00
Tomas Groth
aa224b9568 Try to workaround windows problems. 2017-04-25 21:52:20 +02:00
baa09a7dd6 Mock comes with Python as of 3.3, and I don't think there is anyone using lower than 3.3, so let's use Python's mock directly now 2017-04-23 22:17:55 -07:00
Tomas Groth
f1b34efcac More tests. 2017-04-21 21:40:28 +02:00
Tomas Groth
fa9cdc5b94 Added songbeamer chord import test 2017-04-17 21:35:34 +02:00
Tomas Groth
111cff72a1 trunk 2017-04-11 10:05:13 +02:00
Gary Talent
b4f461c54f Fix EW6 changes to conform to PEP8. 2017-03-29 16:52:56 -05:00
Gary Talent
5209daab45 Update to trunk. 2017-03-29 16:40:54 -05:00
4183f186ce Various fixes and things:
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
...

bzr-revno: 2728
2017-03-24 19:33:45 -07:00
Tomas Groth
31ee3999c0 merge lastest trunk 2017-03-15 20:51:10 +01:00
Simon Hanna
e97c157a19 Add comment 2017-03-13 13:43:55 +01:00
Simon Hanna
f7c944acc9 Add test 2017-03-13 13:42:20 +01:00
4bae0fcd69 Fix up two tests 2017-03-10 15:48:59 -07:00
324652c347 Port some bugfixes from 2.4 to trunk 2017-03-09 22:42:38 -07:00
094b1f73bc Fix a test 2017-03-01 21:43:45 -07:00
Tomas Groth
dbdc4a6712 Made to possible to disable chord support completely. Now everything between [ and ] is considered a chord. 2017-02-26 22:14:49 +01:00
Tomas Groth
56d2eaa4c2 trunk 2017-01-25 22:17:27 +01:00
second@tgc.dk
df668fde84 Clean search lyrics for formatting tags. Fixes bug #1655988.
Fix an issue with easyslide import not handling verse order correctly. Fixes bug #1655985.
Improve the songbeamer encoding detection. Fixes bug #1530597.
Handle a few videopsalm quirks. Fixes bug #1652851.

bzr-revno: 2718
2017-01-20 21:42:01 +00:00
Tomas Groth
02ee7ac7dc Fix an issue with easyslide import not handling verse order correctly. 2017-01-12 22:31:01 +01:00
Olli Suutari
1c2ea31112 - Merged trunk on 8.1.17 2017-01-08 21:12:12 +02:00
Tim Bentley
74ca42e220 Yet another year goes by 2016-12-31 11:01:36 +00:00
Olli Suutari
a9520ced68 - Merged trunk on 23.12.16 2016-12-23 22:16:24 +02:00
Tomas Groth
d1bca6d52a trunk 2016-12-23 10:14:22 +01:00
3639785151 Fix bug #1642684 by rather just setting the edit text to a blank string
Fixes: https://launchpad.net/bugs/1642684
2016-12-15 16:11:42 +02:00
Olli Suutari
01029c8d65 - Added a test for checking hidden "Written by" text. 2016-12-04 05:08:56 +02:00
Olli Suutari
f3ce137233 - Merged trunk on 4.12.16 2016-12-04 00:48:30 +02:00
Tomas Groth
5468def937 pep8 fixes 2016-11-15 22:13:52 +01:00
Tomas Groth
bbc670cc36 trunk 2016-11-15 21:53:50 +01:00
Tomas Groth
88519e2cc1 Added a test for chordpro import. 2016-09-25 21:27:46 +02:00
Olli Suutari
2f8a5ba906 - Fixed the test 2016-09-18 23:15:33 +03:00