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

14618 Commits

Author SHA1 Message Date
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 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 a06b41d7ac merge trunk 2017-04-25 20:54:18 +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
Philip Ridout 53b210d9cd Changeged 'combined' bible verses and made a seperate 'saved' list 2017-03-31 19:41:38 +01: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
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@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
raoul@snyman.info 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
raoul@snyman.info d44244a1e3 Fix bug #1668669 by reducing the height of the settings window 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1668669 (revision 2724)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1909/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1820/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1760/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1494/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-W...

bzr-revno: 2724
 2017-03-02 17:55:25 +00:00