Commit Graph

2029 Commits

Author SHA1 Message Date
Olli Suutari
b3d537eec8 - Merged trunk on 17/10/16 2016-10-17 07:29:35 +03:00
Olli Suutari
97d828af43 - Added pip's fix for sword test 2016-10-04 16:48:54 +03:00
Olli Suutari
3c733ddd20 - Merged trunk on 4.10.16 2016-10-04 16:39:14 +03:00
Olli Suutari
e46174d653 - Added the SWORD importer test fix by phill to this branch 2016-10-04 12:06:17 +03:00
Olli Suutari
400595adf5 - Fixed tests for creating creator lists 2016-10-04 11:43:52 +03:00
Tomas Groth
88519e2cc1 Added a test for chordpro import. 2016-09-25 21:27:46 +02:00
Tim Bentley
c8dad716cc Review Comments 2016-09-19 19:51:48 +01:00
Olli Suutari
2f8a5ba906 - Fixed the test 2016-09-18 23:15:33 +03:00
Tomas Groth
32cfacff7e Skip MediaShout import testing on non-win platforms. 2016-09-18 17:47:59 +02:00
Tomas Groth
3a3ca8d933 Fix fetching bible texts from CrossWalk. 2016-09-18 16:54:55 +02:00
Olli Suutari
ff2e1d1ea7 - The checking for not_called_once does not work apparently, fails in jenkins but passes in nosetests. 2016-09-18 02:07:24 +03:00
Olli Suutari
190baf19d5 - Added two new tests for lock button toggle. 2016-09-18 01:53:47 +03:00
Olli Suutari
09da152372 - Added a test for toggle lock button
- Removed give focus to Select bookname on Select tab, may be confusing.
2016-09-17 00:43:30 +03:00
Olli Suutari
ba3b2396e7 - Merged trunk on 16.9.16 2016-09-16 22:54:25 +03:00
Philip Ridout
2dd770ea11 PEP fixes 2016-09-09 22:47:29 +01:00
Olli Suutari
639c01dfe2 - Merged trunk on 9.9.16 2016-09-09 10:58:15 +03:00
Olli Suutari
a99bd8603f - Combined some <strong> tags in expection dialogue.
- Added new line to the end of the test.
2016-09-09 10:57:11 +03:00
Olli Suutari
359dded22a - Fixed the test 2016-09-09 10:51:19 +03:00
Tim Bentley
8f94d10c8d add tests 2016-09-08 06:06:36 +01:00
Philip Ridout
4a71bda0d1 More BibleImport tests 2016-09-05 21:27:14 +01:00
Philip Ridout
223b198dc8 Moved some import related stuff out of the db module 2016-09-04 22:16:43 +01:00
Philip Ridout
80cdc35433 Move already refactored imorters over to using the log methods in OpenLPMixin 2016-09-04 17:15:57 +01:00
Olli Suutari
4a57caf084 - Removed the old "escape item" test. 2016-09-02 19:24:57 +03:00
Olli Suutari
2fcd292969 - Renamed some code 2016-09-02 18:52:44 +03:00
Olli Suutari
2c4dbda42f - The new method now also stops loops. 2016-09-02 18:41:16 +03:00
Philip Ridout
6fc1467c5a PEP fixes 2016-09-02 15:32:14 +01:00
Philip Ridout
14187f4884 Mostly refactors of OSIS + tests 2016-09-02 15:23:20 +01:00
Philip Ridout
628027ffc8 Moved validate_xml in to bible import and improved operation. More tests 2016-08-29 17:11:09 +01:00
Philip Ridout
e91b87da8c Start on osis importer. Some further improvements of other importers 2016-08-28 22:03:04 +01:00
Philip Ridout
9b41814511 Merge from yet-more-refactors 2016-08-27 14:33:21 +01:00
Olli Suutari
46a7c92a90 - Merged trunk 2016-08-25 22:27:55 +03:00
Philip Ridout
28d94b7d10 moved some static methods to module level 2016-08-21 21:36:59 +01:00
Philip Ridout
894b4fbf10 revert changes to http.py due to circular references 2016-08-20 21:00:50 +01:00
Olli Suutari
4733aa2169 - Removed modifications to test_mainwindow. 2016-08-20 22:17:00 +03:00
Olli Suutari
8224e39a2c - Added test 2016-08-20 22:14:15 +03:00
Olli Suutari
685c01ec25 - Renamed test title from x_test to test_x 2016-08-20 21:59:31 +03:00
Philip Ridout
7c77d7e8bd Refactor of OpenSong Bible importer + 100% test coverage 2016-08-20 19:12:42 +01:00
Olli Suutari
b5c4cb1f85 - pep8 fix (2x blank line) 2016-08-20 01:53:20 +03:00
Olli Suutari
345978286b - Added a test. 2016-08-20 01:49:51 +03:00
Tomas Groth
825a703cd0 pep8 fixes 2016-08-19 17:05:44 +02:00
Tomas Groth
c463c46cf6 Fixed various bugs in the songbeamer chord import, and added a test. 2016-08-19 16:51:23 +02:00
Tomas Groth
25c268145a merge trunk 2016-08-18 21:04:44 +02:00
Philip Ridout
46b6d041cd Opensong refactors and tests 2016-08-18 07:31:36 +01:00
Philip Ridout
6ab2686b09 Modify CSV Importer and test to give 100% coverage! 2016-08-16 21:36:21 +01:00
Philip Ridout
9d5829e3a5 head 2016-08-16 19:49:47 +01:00
b657d255cc Remove blank line
Fixes: https://launchpad.net/bugs/1547964
2016-08-14 22:58:27 +02:00
693c18a23a Add some tests for the MediaShout importer 2016-08-14 22:48:36 +02:00
Philip Ridout
f08d0c28a5 further bible refactors 2016-08-14 11:00:27 +01:00
c2b05e3454 Fix bug #1547964 by ignoring the exception (it's harmless)
Fixes: https://launchpad.net/bugs/1547964
2016-08-14 10:24:17 +02:00
14b351f2ae HEAD
Fixes: https://launchpad.net/bugs/1608194
2016-08-13 16:57:38 +02:00
2bd58e1c29 Fix some pep8 issues 2016-08-13 16:41:24 +02:00
879a51a1fe Fix the tests for SongSelect and write tests for the SystemPlayer 2016-08-13 16:29:12 +02:00
Philip Ridout
2416009860 HEAD 2016-08-12 20:16:12 +01:00
c79917502b Update slot signatures to comply with PyQt5.6's stricter checks.
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/stricter-slot-signatures (revision 2685)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1723/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1634/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1572/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1333/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2693
2016-08-12 18:28:34 +01:00
phill.ridout@gmail.com
a503c1a0f9 Some more bible refactors. Mainly focusing on xml parsing and the csv importer
lp:~phill-ridout/openlp/more-bible-refactors (revision 2699)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1708/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1619/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1557/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1319/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/909/
[SUCCESS] htt...

bzr-revno: 2692
2016-08-12 18:26:54 +01:00
f92302a41e HEAD 2016-08-12 12:30:07 +02:00
c9ff88ebfc Removed a log line I never wrote and move a variable for a test I need it in 2016-08-12 12:24:54 +02:00
Philip Ridout
83b30799ca finished up with tests 2016-08-11 20:34:55 +01:00
Philip Ridout
0617f71134 split out web bible importers 2016-08-11 20:03:58 +01:00
Philip Ridout
5ac5c6cd68 split the web bible importers out io their own files 2016-08-11 20:02:29 +01:00
Philip Ridout
226432a3c3 head 2016-08-11 18:38:20 +01:00
Olli Suutari
50131ba202 - Merged trunk and resolved conflict that was created by ui-messages-part-1 branch. 2016-08-10 21:50:40 +03:00
suutari.olli@gmail.com
ae81497fe3 This branch includes various UI string changes, such as:
- Media Manager, Projector Manager, Service Manager, Theme Manager,
   Preview Panel and Live Panel have been renamed to: ”Library,
   Projectors, Service, Themes, Preview and Live."
- Tooltips/texts for these have been changed.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
-  etc...

In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...

bzr-revno: 2688
2016-08-10 19:31:33 +01:00
0fc598fab5 HEAD 2016-08-10 11:13:45 +02:00
51f3a0f406 Fix some slot signatures that were the incorrect type 2016-08-10 11:07:49 +02:00
Olli Suutari
fc3b2f021e - Merged trunk on 10/8/16. 2016-08-10 00:37:59 +03:00
Philip Ridout
9d43344a92 pep fixes 2016-08-09 21:56:04 +01:00
Philip Ridout
4866dce071 test fixes 2016-08-09 21:49:52 +01:00
Philip Ridout
f1b25ef503 Moved importers in to dedicated directory 2016-08-09 21:45:25 +01:00
Philip Ridout
b502c0b79d Moved get file encoding from lib to common 2016-08-09 07:24:04 +01:00
Philip Ridout
a0882bd523 Refactor csv importer 2016-08-08 21:02:18 +01:00
Philip Ridout
a78c3d67e7 head 2016-08-08 19:11:32 +01:00
Philip Ridout
e9ec672756 improved encoding detection code. Tests added 2016-08-08 19:09:33 +01:00
a89495063e merge trunk 2016-08-07 13:52:42 -07:00
1ff94a74a3 Qt5 updates for projector/signal mismatches 2016-08-07 13:51:35 -07:00
suutari.olli@gmail.com
fb105f2e0b This branch introduces following improvements to Quick Bible search:
- Combined Reference/Text search which first performs the Reference
  search and then moves to Text search if nothing is found.
- Added Search while typing functionality for Quick Bible search
- Possibility to use “.” when shortening Book names in Reference search.
  For an example Gen. 1 = Gen 1 = Genesis 1.
- New/Improved error messages
  (E.g. added actual example verses to Reference error)
- 3 New settings for controllin...

bzr-revno: 2686
Fixes: https://launchpad.net/bugs/1591480
2016-08-07 19:33:46 +01:00
Philip Ridout
1abcff7519 PEP fixes 2016-08-07 12:20:53 +01:00
Philip Ridout
a4d6120bd4 Refactor xml parsing and language detection out in to a bible importer class 2016-08-07 11:15:43 +01:00
2f7a1ab456 Merge trunk 2016-08-05 12:41:22 -07:00
Philip Ridout
8257dbb282 HEAD 2016-08-03 21:27:05 +01:00
Philip Ridout
d9d740ad8b Style fixes 2016-08-03 21:10:41 +01:00
Philip Ridout
db00a3980f Missed tests 2016-08-03 20:56:53 +01:00
Philip Ridout
60767c8ce4 Fixes bug #917164. A start on refactoring bibles 2016-08-03 18:26:10 +01:00
suutari-olli
7eac4d5e38 - Merged trunk on 2.8.16 2016-08-02 23:18:26 +03:00
Tomas Groth
82faa1da5e Change pylint test so it works with nose2 2016-08-02 21:32:36 +02:00
Tomas Groth
7ca7ae9c07 Ignore distutils errors 2016-08-01 20:49:01 +02:00
Tomas Groth
76be31fee1 Only run pylint tests if specified. 2016-08-01 20:00:58 +02:00
Tomas Groth
189b2dd400 Improve pylint testing, fixed a few issues. 2016-08-01 19:42:29 +02:00
suutari-olli
1298b629f1 - Merged trunk on 31.7.16 2016-07-31 14:58:54 +03:00
suutari-olli
0923ca6a40 - Merged trunk on 28.7.16 2016-07-28 22:57:21 +03:00
Tomas Groth
449b46ab3d merge trunk 2016-07-27 21:01:57 +02:00
Tomas Groth
b781fa6169 some cleanups, comments and a test. 2016-07-26 21:02:35 +02:00
Tomas Groth
de54ec2715 merge trunk 2016-07-25 22:48:30 +02:00
Tomas Groth
611c970eb0 More work on chords 2016-07-25 22:07:07 +02:00
0dcae022bc some pep8 fixes 2016-07-24 22:49:00 +02:00
ea455d9b32 Write some tests 2016-07-24 22:41:27 +02:00
suutari-olli
aa1cd8fa91 - Merged trunk on 24.7.16
- Added superflys startup traceback fix to my code
- Resolved conflicts
2016-07-24 23:20:25 +03:00
Tomas Groth
031ae9ebc1 Use BibleGateway standard site instead of the legacy site. Fixes bug 1562384.
Fixes: https://launchpad.net/bugs/1562384
2016-07-24 21:49:29 +02:00
suutari-olli
b364bb5cf0 - merged trunk on 24.7.16 2016-07-24 21:56:13 +03:00
e231398010 HEAD 2016-07-24 14:25:46 +02:00