Commit Graph

14778 Commits

Author SHA1 Message Date
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
Gary Talent
5209daab45 Update to trunk. 2017-03-29 16:40:54 -05:00
fc505c2a13 Fix the author_type import properly
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-author_type (revision 2731)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1950/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1861/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1802/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1528/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/...

bzr-revno: 2730
2017-03-28 11:43:40 -07:00
44f8994080 Fix a problem with loading Qt's translation files, bug #1676163
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-translations (revision 2729)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1944/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1855/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1796/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1522/
[SUCCESS] https://ci.openlp.io/job/Branch...

bzr-revno: 2729
2017-03-28 11:42:47 -07:00
dce77d2160 Try to figure out why it segfaults on Jenkins but not on my machine 2017-03-27 22:19:33 -07:00
6054f0cae9 Try to figure out why it segfaults on Jenkins but not on my machine 2017-03-27 22:18:04 -07:00
4f6afb71d1 Fix the author_type import properly 2017-03-27 22:15:05 -07:00
815c32b87f Fix a problem with loading Qt's translation files, bug #1676163
Fixes: https://launchpad.net/bugs/1676163
2017-03-27 17:36:54 -07: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
97c33fde46 Fix test. 2017-03-23 20:36:09 +01:00
84fdab297f Changed to use plain old SQL 2017-03-22 22:31:51 -07:00
cd733f2901 Fix up a linting issue and removed and unused import in lp-merge.py 2017-03-22 22:12:37 -07:00
659c70b34c Update changelog 2017-03-22 22:08:14 -07:00
c3f3b36cd3 Removed some unnecessary comments; Updated changelog 2017-03-22 22:07:16 -07:00
a2a51b95dd Various fixes:
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- 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
- Fix song database upgrades by moving upgrades 4 and 5 into 6 and writing some damage control
- Add a CHANGELOG.rst file
2017-03-22 21:43:13 -07:00
07ee83b4fe Pull in refactored merge script 2017-03-22 15:18:13 -07:00
cd7b18ef30 Cleanup BibleImportForm tests 2017-03-22 15:17:43 -07:00
Tomas Groth
3bf9c53523 Updated appveyor script to new setup. 2017-03-22 22:35:55 +01:00
Tomas Groth
9ae1af72c7 Minor adjustsments + a test. 2017-03-17 22:12:29 +01:00
Tomas Groth
31ee3999c0 merge lastest trunk 2017-03-15 20:51:10 +01:00
simon.hanna@serve-me.info
0307a1acf5 Minor fix that makes sure that songbeamer files get decoded properly.
bzr-revno: 2727
2017-03-13 17:56:42 +00: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
Simon Hanna
172625b193 Make sure songbeamer songs are decoded correctly 2017-03-13 13:16:12 +01:00
c256477919 Formalise the merge script 2017-03-11 22:48:23 -07:00
05a39cb7ea Fix a test that was causing a segfault 2017-03-10 16:46:14 -07:00
3d39e2c77d Ignore a test that is causing a segfault 2017-03-10 16:20:44 -07: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
tim.bentley@gmail.com
e5abad85a7 Will SSL being removed in 2.8 it and not supported in Android and iOS lets prevent it from living in 2.6.
Just removed the SSL code to stop the settings and not start the SSL server full removal will be in 2.8 when we change server infrastructure,
With test this time.

lp:~trb143/openlp/removessl26 (revision 2728)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1921/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1832/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Te...

bzr-revno: 2726
2017-03-04 17:41:53 +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
c0eb055041 Remove ssl from build 2017-03-04 10:24:53 +00:00
196a6f95f1 Fix bug #1666005 and bug #1668994
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/off-by-one (revision 2725)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1914/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1825/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1766/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1089/
[...

bzr-revno: 2725
2017-03-02 17:58:46 +00:00