Ken Roberts
a5335adbc4
Initial PJLink class 2 updates
2017-05-12 02:51:56 -07:00
Raoul Snyman
d74c9c0c81
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.
...
Windows tests are failing due to file sharing (we've had this issue before), unrelated to my changes.
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/refactor-mock (revision 2734)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1992/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1902/
[SUCCESS] https://...
bzr-revno: 2733
2017-05-10 18:50:33 +01:00
Raoul Snyman
9b70fe44cf
HEAD
2017-05-08 12:10:46 -07:00
Raoul Snyman
335fed689d
Last few tests with bad imports
2017-05-08 12:04:14 -07:00
Raoul Snyman
aeabd498a0
Remove the now defunct version detection and imports
2017-05-08 11:33:11 -07:00
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
1100cd5a5b
Fix segfault with QFormLayout in BibleImportForm\nAlso fix up a failing test
2017-05-06 10:22:34 +01:00
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
0fc912bd8f
Updated jenkins script to match new setup.
2017-05-04 23:53:50 +02:00
b98468e4dd
More fixes for appveyor scripts.
2017-05-03 22:16:52 +02:00
a57a12441b
Fix and improvements to appveyor build script
2017-05-03 20:40:30 +02:00
a06b41d7ac
merge trunk
2017-04-25 20:54:18 +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
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
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
3bf9c53523
Updated appveyor script to new setup.
2017-03-22 22:35:55 +01:00
0307a1acf5
Minor fix that makes sure that songbeamer files get decoded properly.
...
bzr-revno: 2727
2017-03-13 17:56:42 +00:00
e97c157a19
Add comment
2017-03-13 13:43:55 +01:00
f7c944acc9
Add test
2017-03-13 13:42:20 +01:00
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
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
df77c3ebd9
add test
2017-03-04 16:51:51 +00:00
0e54621999
test fix
2017-03-04 10:28:07 +00:00
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
Raoul Snyman
094b1f73bc
Fix a test
2017-03-01 21:43:45 -07:00
Raoul Snyman
3bc6fc0b77
Fix bug #1666005 and bug #1668994
2017-03-01 21:34:24 -07:00
Raoul Snyman
f68336a49f
Make the settings dialog as small as possible
...
Fixes: https://launchpad.net/bugs/1668669
2017-03-01 17:07:16 -07:00
20398c648f
Merge in regenerated resources
...
bzr-revno: 2723
2017-02-26 07:01:30 +00:00
76c2ec8b8c
Regened resources
2017-02-25 17:30:39 +00:00
cf4b9d4fc1
Bible media item refactors.
...
Added the ability to sort the 'select' aka 'advanced' bible books combo box alphabetically. (note resources will need regen to show the button icon, I'll submit this in another merge proposal to keep this one a tiny bit cleaner.
Lots of Tests!
bzr-revno: 2722
2017-02-24 06:51:43 +00:00
Ken Roberts
Raoul Snyman
Phill
Tomas Groth
simon.hanna@serve-me.info
tim.bentley@gmail.com