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

831 Commits

Author SHA1 Message Date
Philip Ridout 78f38780ce head 2017-05-26 14:30:54 +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
Raoul Snyman 335fed689d Last few tests with bad imports 2017-05-08 12:04:14 -07:00
Tomas Groth aa224b9568 Try to workaround windows problems. 2017-04-25 21:52:20 +02:00
Raoul Snyman 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
Philip Ridout a3146d7a2c PEP Fixes 2017-04-03 21:28:16 +01:00
Philip Ridout 53b210d9cd Changeged 'combined' bible verses and made a seperate 'saved' list 2017-03-31 19:41:38 +01: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
Raoul Snyman 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
Raoul Snyman c3f3b36cd3 Removed some unnecessary comments; Updated changelog 2017-03-22 22:07:16 -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
Raoul Snyman 4bae0fcd69 Fix up two tests 2017-03-10 15:48:59 -07:00
Raoul Snyman 324652c347 Port some bugfixes from 2.4 to trunk 2017-03-09 22:42:38 -07:00
Tim Bentley 699342c89d pep8 2017-03-05 17:07:21 +00:00
Tim Bentley 7a72b2cad4 download and deploy works 2017-03-05 09:23:28 +00:00
Tim Bentley b3fb5764c6 fix years 2017-03-04 19:17:59 +00:00
Tim Bentley f76e030ac9 more cleanups 2017-03-04 17:32:47 +00:00
Tim Bentley df77c3ebd9 add test 2017-03-04 16:51:51 +00:00
Tim Bentley 0e54621999 test fix 2017-03-04 10:28:07 +00:00
Tim Bentley 5d917de2f8 Head 2017-03-03 19:27:31 +00:00
Raoul Snyman 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
Philip Ridout 162c178d6e HEAD 2017-02-18 07:23:15 +00: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
Tim Bentley 0d540ae40b Add remotes file checking 2016-12-24 09:10:13 +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
Tim Bentley caacb7df88 finish these tests 2016-12-22 17:31:53 +00:00
Tim Bentley fe3014fc66 Add tests 2016-12-22 17:02:39 +00:00
Tim Bentley 126c5462a0 Head 2016-12-22 15:12:03 +00:00
Philip Ridout d9ccd966d8 Pep fixes 2016-12-18 18:47:54 +00:00
Philip Ridout 849bbd2c51 Pep fixes 2016-12-18 18:42:28 +00:00
Philip Ridout a11e731ab0 Tests 2016-12-18 14:05:10 +00:00
Philip Ridout 61c76c39e6 Tests 2016-12-18 14:01:05 +00:00
Raoul Snyman 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
raoul@snyman.info d2e2985229 Add an importer for WordProject bibles, and fix some annoying GUI quirks in wizards. 
http://forums.openlp.org/discussion/3340/wordproject-format

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/wordproject-importer (revision 2709)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1848/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1759/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1697/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2708
 2016-12-04 07:53:18 +00: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 595fd90d45 Fix some errors on windows 2016-11-29 14:06:54 +01:00
Raoul Snyman d0ed37e1d5 Move contents of html files into actual html files 2016-11-25 16:17:34 +02:00
Raoul Snyman 826bfd02dd Add a WordProject Bible importer 2016-11-24 23:48:51 +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
Philip Ridout 94fca706ff Move no results functionality to the ListWidgetWithDnD 2016-11-10 07:09:04 +00:00
Philip Ridout 87fede54dc Fixes #1623711* 2016-11-01 19:17:57 +00:00
Tim Bentley 2d695f13ea Head 2016-10-26 19:12:38 +01:00
Olli Suutari a7b4d001c7 - Merged trunk and fixed conflict. 2016-10-17 20:40:45 +03:00
suutari.olli@gmail.com ed647f2828 Fixed the issue where web bible's result in traceback in "Search while typing" 
(by removing one miss-placed line)

This branch also fixes the issue where the new "Clear Bible search results" and 
"Lock button" give focus to Text search if it is used in "Select" tab.

lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick (revision 2707)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1775/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Fun...

bzr-revno: 2698
 2016-10-17 17:36:09 +01: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
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
Tomas Groth 32cfacff7e Skip MediaShout import testing on non-win platforms. 2016-09-18 17:47:59 +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
Gary Talent 5435dfc5cc Add test for EasyWorship 6 importer. 2016-09-16 23:39:40 -05: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
Gary Talent b5f08bf54c Add support for importing EasyWorship6 databases 2016-09-07 00:15:37 -05: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
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 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
Raoul Snyman b657d255cc Remove blank line 
Fixes: https://launchpad.net/bugs/1547964
 2016-08-14 22:58:27 +02:00
Raoul Snyman 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
Tim Bentley c6c7931323 head 2016-08-14 10:23:12 +01:00
Raoul Snyman 14b351f2ae HEAD 
Fixes: https://launchpad.net/bugs/1608194
 2016-08-13 16:57:38 +02:00
Raoul Snyman 2bd58e1c29 Fix some pep8 issues 2016-08-13 16:41:24 +02:00
Raoul Snyman 879a51a1fe Fix the tests for SongSelect and write tests for the SystemPlayer 2016-08-13 16:29:12 +02:00
Tim Bentley b3f10eb852 fix test 2016-08-12 19:56:25 +01:00
Tim Bentley 225160be24 Head 2016-08-12 19:21:30 +01:00
Philip Ridout 83b30799ca finished up with tests 2016-08-11 20:34:55 +01:00
Philip Ridout 9d43344a92 pep fixes 2016-08-09 21:56:04 +01:00
Philip Ridout f1b25ef503 Moved importers in to dedicated directory 2016-08-09 21:45:25 +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
Tim Bentley cade36a332 Head 2016-08-07 19:37:15 +01: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
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 0923ca6a40 - Merged trunk on 28.7.16 2016-07-28 22:57:21 +03: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
suutari-olli b364bb5cf0 - merged trunk on 24.7.16 2016-07-24 21:56:13 +03:00
Tim Bentley 6ea956f432 fix tests 2016-07-23 06:24:28 +01:00
Tim Bentley 6d9d2ef32e remove broken test 2016-07-23 06:14:20 +01:00
Tim Bentley a4ce16809e remove directory 2016-07-23 06:00:01 +01:00
Tim Bentley ca2ceba972 Head 2016-07-23 05:59:26 +01:00
Tim Bentley 76af52b2bf Bye Bye Remote 2016-07-08 18:10:18 +01:00
Tomas Groth 69951133fe Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945. 
Fixes: https://launchpad.net/bugs/1594945
 2016-07-07 22:47:57 +02:00
Tim Bentley fa5ce45db0 it works 2016-06-19 07:16:01 +01:00
second@tgc.dk 45d2640159 "Fix various pyodbc related issues. Fixes bug 1590657. 
Fix of tracback during SongPro import. Fixes bug 1582152.
Fix traceback during songshowplus import. Fixes bug 1585489.
Skip PresentationManager files we do not support."

bzr-revno: 2677
Fixes: https://launchpad.net/bugs/1582152, https://launchpad.net/bugs/1585489, https://launchpad.net/bugs/1590657
 2016-06-16 22:12:27 +02:00
suutari-olli 7c74b50318 - Code cleanup (Removed 2 un-required empty rows) 2016-06-15 00:55:37 +03:00
Tomas Groth 0c2b68ac54 merge trunk 2016-06-14 23:12:54 +02:00
suutari-olli db003d7ec6 - Merged trunk on 14.6.16 
To do?
- Add clear search results button for locked Bible search results
- Prevent duplicated search results on "Lock search results"
 2016-06-14 23:54:36 +03:00
Tim Bentley ed28ad2ebc fix tests 2016-06-14 21:48:32 +01:00
Tim Bentley 7d049eb2af Rename Classes 2016-06-14 21:12:04 +01:00
Tomas Groth e89803a3ad merge trunk 2016-06-14 21:06:54 +02:00
Tim Bentley 6a81063fe7 Test apicontroiler 2016-06-11 22:13:48 +01:00
Tim Bentley 6a955a5573 api and router work, move settings and tab 2016-06-10 17:16:35 +01:00
Tomas Groth 2fe7a9d127 trunk 2016-06-08 21:27:52 +02:00
Tomas Groth 3d98d60d59 Implement chord transposing in the lyrics editor. 2016-06-07 22:21:21 +02:00
Raoul Snyman 0d2745a1d1 Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left. 2016-06-07 09:35:06 +02:00
Tim Bentley 2b0e61d5fd Too many changes 2016-06-05 22:26:06 +01:00
Tim Bentley 32fad35f79 move remote to api and add waitress 2016-06-05 22:16:13 +01:00
Tim Bentley 05be4e606c Fix up tests 2016-06-05 19:48:07 +01:00
suutari-olli 9990472586 - Merged trunk on 5.6.16 
- Removed some additional error messages from "Search while typing"
  (Count verses not found in both bibles, no Bibles installed)
 2016-06-05 15:15:51 +03:00
Ian Knight 47da0a1c8b Fixed PEP8 Errors 2016-06-02 20:02:34 +09:30
Raoul Snyman ec8ace4929 Fixed up some issues and refactored a method that wasn't actually a test. 2016-06-02 01:14:58 +02:00
Raoul Snyman caeb3d3ff7 Found the other tests, Mom! 2016-06-01 23:42:54 +02:00
Raoul Snyman 672b8334fa Initial attempt to move to nose2 2016-05-31 23:40:13 +02:00
Tomas Groth 11e7ff5621 trunk 2016-05-26 15:09:03 +02:00