Commit Graph

14984 Commits

Author SHA1 Message Date
9b70fe44cf HEAD 2017-05-08 12:10:46 -07:00
335fed689d Last few tests with bad imports 2017-05-08 12:04:14 -07:00
aeabd498a0 Remove the now defunct version detection and imports 2017-05-08 11:33:11 -07:00
Tomas Groth
e00e8117a9 Added detection of songbeamer tags, if they are manually inserted or not. 2017-05-07 22:26:03 +02:00
Philip Ridout
04063a4371 Annother fix 2017-05-07 19:39:17 +01:00
97b2d632c0 Test data for pjlink2 update 2017-05-07 03:15:10 -07:00
Philip Ridout
7485e53a72 A few minor changes + annother test 2017-05-07 11:12:08 +01:00
Philip Ridout
a3739f2247 HEAD 2017-05-06 21:34:28 +01:00
Phill
9eeeb243ea Fix the QFormLayout in BibleImportForm
Fix one of the tests that was skipped

lp:~phill-ridout/openlp/test_fixes (revision 2732)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1973/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1883/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1824/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1206/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1074/
[SUCCESS] https://ci.openlp.io/job/Branch-04c...

bzr-revno: 2732
2017-05-06 20:42:24 +01:00
Philip Ridout
b0c5b4177b mor PEP fixes 2017-05-06 11:51:54 +01:00
Philip Ridout
4e88913aa0 PEP fixes 2017-05-06 11:45:09 +01:00
Philip Ridout
2747f370a4 Fixed up test 2017-05-06 11:34:56 +01:00
Philip Ridout
6492ee9624 merge from test_fixes 2017-05-06 11:19:48 +01:00
Philip Ridout
312e3e007b head 2017-05-06 11:19:15 +01:00
Philip Ridout
1100cd5a5b Fix segfault with QFormLayout in BibleImportForm\nAlso fix up a failing test 2017-05-06 10:22:34 +01:00
Philip Ridout
902a2161fb fixes 2017-05-05 22:00:59 +01:00
Tomas Groth
d60ea23de6 Try to fix songbeamer chord imports 2017-05-05 20:48:01 +02:00
Tomas Groth
7f64106acb Fix a traceback when serviceitem type isn't set 2017-05-05 20:47:19 +02:00
Tomas Groth
c17d6c7866 Integrate the Jenkins setup with the AppVeyor setup, so that Jenkins fails if AppVeyor fails.
bzr-revno: 2731
2017-05-05 17:27:20 +01:00
Tomas Groth
0fc912bd8f Updated jenkins script to match new setup. 2017-05-04 23:53:50 +02:00
Tomas Groth
b98468e4dd More fixes for appveyor scripts. 2017-05-03 22:16:52 +02:00
Tomas Groth
a57a12441b Fix and improvements to appveyor build script 2017-05-03 20:40:30 +02:00
Tomas Groth
a39240badf Replace songbeamers flatnote representationwith the actual flatnote sign. 2017-05-01 21:16:39 +02:00
Tomas Groth
aa224b9568 Try to workaround windows problems. 2017-04-25 21:52:20 +02:00
Tomas Groth
bdfac76483 improve db cleanup 2017-04-25 21:36:37 +02:00
Tomas Groth
e9e7285b8c remove session instead of close to release file. 2017-04-25 21:18:03 +02:00
Tomas Groth
a06b41d7ac merge trunk 2017-04-25 20:54:18 +02:00
Tomas Groth
3b46b8416d Only convert bracket tags to chords on songs when chords are enabled. 2017-04-25 20:46:50 +02:00
Tomas Groth
55f63a0a0f Only convert bracket tags to chords for songs. 2017-04-25 16:41:35 +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
536a919675 Hide transpose buttons if chords are disabled, and check for invalid chords on verseedit close. 2017-04-20 22:23:17 +02:00
Tomas Groth
6e9520c8b0 Fixed serviceitem test 2017-04-19 21:37:08 +02:00
Tomas Groth
d36d576dc9 Added another chord test. 2017-04-18 21:20:36 +02:00
Tomas Groth
fa9cdc5b94 Added songbeamer chord import test 2017-04-17 21:35:34 +02:00
Tomas Groth
5187b7b945 Added some tests and fixed a bug. 2017-04-11 14:44:28 +02:00
Tomas Groth
c97aaab763 Fix an issue with songbeamer import where chords were pushed a line. 2017-04-11 10:43:45 +02:00
Tomas Groth
111cff72a1 trunk 2017-04-11 10:05:13 +02:00
Philip Ridout
50ce8fd97e Revert resources.py for review 2017-04-05 08:22:19 +01:00
Philip Ridout
fc9ed3bc2c PEP Fixes 2017-04-03 21:32:13 +01:00
Philip Ridout
a3146d7a2c PEP Fixes 2017-04-03 21:28:16 +01:00
Philip Ridout
eee14a654a Tests and added icon 2017-04-02 21:28:55 +01:00
Gary Talent
80c8e5b71f Cleanup EW6 invalid directory messages. 2017-03-31 23:45:12 -05:00
Gary Talent
2cbf1422d1 Fix error message for invalid EasyWorship 6 database directories.
The old one was copied from the EasyWorship 2009 database importer.
2017-03-31 23:41:01 -05:00
Gary Talent
e07693c95f EW6 Importer: Cleanup array cropping. 2017-03-31 23:26:14 -05:00
Philip Ridout
53b210d9cd Changeged 'combined' bible verses and made a seperate 'saved' list 2017-03-31 19:41:38 +01:00
Gary Talent
5a36232c93 Add option to import EasyWorship 6 database from any level in the database directory tree. 2017-03-30 19:53:31 -05:00
Gary Talent
76000b4e26 EW6 Importer: Replace appended string paths with os.path.join. 2017-03-30 15:48:23 -05:00
Gary Talent
3f56ca482e Remove empty lines from EW6 importer methods. 2017-03-30 14:45:38 -05:00
Gary Talent
b4f461c54f Fix EW6 changes to conform to PEP8. 2017-03-29 16:52:56 -05:00