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

14944 Commits

Author SHA1 Message Date
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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman dce77d2160 Try to figure out why it segfaults on Jenkins but not on my machine 2017-03-27 22:19:33 -07:00
Raoul Snyman 6054f0cae9 Try to figure out why it segfaults on Jenkins but not on my machine 2017-03-27 22:18:04 -07:00
Raoul Snyman 4f6afb71d1 Fix the author_type import properly 2017-03-27 22:15:05 -07:00
Raoul Snyman 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
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
Tomas Groth 97c33fde46 Fix test. 2017-03-23 20:36:09 +01:00
Raoul Snyman 84fdab297f Changed to use plain old SQL 2017-03-22 22:31:51 -07:00
Raoul Snyman cd733f2901 Fix up a linting issue and removed and unused import in lp-merge.py 2017-03-22 22:12:37 -07:00
Raoul Snyman 659c70b34c Update changelog 2017-03-22 22:08:14 -07:00
Raoul Snyman c3f3b36cd3 Removed some unnecessary comments; Updated changelog 2017-03-22 22:07:16 -07:00
Raoul Snyman 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
Raoul Snyman 07ee83b4fe Pull in refactored merge script 2017-03-22 15:18:13 -07:00
Raoul Snyman 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
Raoul Snyman c256477919 Formalise the merge script 2017-03-11 22:48:23 -07:00
Raoul Snyman 05a39cb7ea Fix a test that was causing a segfault 2017-03-10 16:46:14 -07:00
Raoul Snyman 3d39e2c77d Ignore a test that is causing a segfault 2017-03-10 16:20:44 -07: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 9451e4def6 add switch to turn off servers 2017-03-05 17:43:18 +00:00
Tim Bentley 699342c89d pep8 2017-03-05 17:07:21 +00:00
Tim Bentley cb9ac8cde2 fix tests 2017-03-05 17:00:21 +00:00
Tim Bentley 1bcb6415c1 fix tests 2017-03-05 16:55:58 +00:00
Tim Bentley 9c3195d166 fix tests 2017-03-05 16:36:16 +00:00
Tim Bentley 71f91e5d15 fix broken plugin 2017-03-05 10:08:05 +00:00
Tim Bentley ef6252bf4b FTW working and UI Strings 2017-03-05 10:02:22 +00:00
Tim Bentley 06baf5c560 fix up deploy unzip 2017-03-05 09:32:11 +00:00
Tim Bentley 7a72b2cad4 download and deploy works 2017-03-05 09:23:28 +00:00
Tim Bentley 9204dc23a0 add tests 2017-03-04 19:24:44 +00:00
Tim Bentley b3fb5764c6 fix years 2017-03-04 19:17:59 +00:00
Tim Bentley d3d36864f6 head remove ssl 2017-03-04 18:27:15 +00:00