Commit Graph

13703 Commits

Author SHA1 Message Date
phill.ridout@gmail.com
d466fde45c lp:~phill-ridout/openlp/bug1623711-2.4 (revision 2653)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1810/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1721/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1659/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1415/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1005/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1073/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2657
2016-11-07 22:43:35 +00:00
Philip Ridout
73c441399f Test 2016-11-01 19:41:21 +00:00
Philip Ridout
0d54103a7a Fixes #1623711 2016-11-01 07:05:26 +00:00
fb585d683a Fix bug #1629079: Attribute error when importing from SongSelect
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1629079-2.4 (revision 2657)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1784/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1695/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1633/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1389/
[SUCCESS] https://ci.openlp.io/job/Branch...

bzr-revno: 2656
2016-10-03 22:44:43 +02:00
4f36d6e12a Fix up the last of the packaging issues and increase test coverage of systemplayer to 100%
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/re-enable-version-checking-2.4 (revision 2656)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1783/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1694/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1632/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1388/
...

bzr-revno: 2655
2016-10-03 22:39:18 +02:00
b789a7809d Fix up the topics problem and split it into its own test 2016-10-01 20:45:05 +02:00
358667356f Bulk up the tests 2016-09-30 14:18:50 +02:00
13eb461f5b Fix bug #1629079 and add some more tests 2016-09-30 12:01:10 +02:00
7c1c0475c6 Increase test coverage to 100% 2016-09-26 23:38:25 +02:00
8526e8287f Fix up the last of the packaging issues 2016-09-26 21:06:19 +02:00
577a27eb66 Release 2.4.3
bzr-revno: 2654
2016-09-24 12:20:25 +02:00
second@tgc.dk
92ccb1681c Fixes getting bible texts from CrossWalk
Fix to handling of form feed char and vertical tab char.

bzr-revno: 2653
2016-09-24 12:15:07 +02:00
Tomas Groth
1e3bc35390 Fix handling special chars in MediaShout import. Fixes bug 1618489.
Fixes: https://launchpad.net/bugs/1618489
2016-09-24 00:06:59 +02:00
Tomas Groth
6fcfe1aecd Fix getting text from crosswalk bibles. 2016-09-24 00:06:15 +02:00
tim.bentley@gmail.com
c62c167d66 Translation updates
bzr-revno: 2652
2016-09-21 20:32:49 +01:00
Tim Bentley
59cc42e666 trans2109 2016-09-21 18:57:29 +01:00
0ba881b5e2 Fix bug #1547964 by ignoring the exception (it's harmless)
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/disconnect-slots-2.4 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1741/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1652/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1590/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1346/
[SUCCESS] https://ci.openlp.io/job/Branch...

bzr-revno: 2651
Fixes: https://launchpad.net/bugs/1547964
2016-08-14 10:33:04 +02:00
4a7d06ca33 Don't need that line anymore 2016-08-14 09:39:57 +02:00
33c5f7674e Fix bug #1547964 by ignoring the exception (it's harmless)
Fixes: https://launchpad.net/bugs/1547964
2016-08-14 09:31:19 +02:00
7d5a640a16 Disconnect the slots for a signal before assigning new ones 2016-08-14 09:03:40 +02:00
tim.bentley@gmail.com
cdf6a4cbff Translation updates
bzr-revno: 2650
2016-08-14 06:43:46 +01:00
Tim Bentley
9c7dbecd45 trans 1308 2016-08-13 22:21:07 +01:00
tim.bentley@gmail.com
47dff51d00 Fix bug and fully test it.
lp:~trb143/openlp/themecombo-24 (revision 2649)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1730/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1641/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1579/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1339/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/929/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/997/
[SUCCESS] htt...

bzr-revno: 2649
Fixes: https://launchpad.net/bugs/1596668
2016-08-13 21:58:27 +01:00
Tim Bentley
a7dd65245a Fix bug and test it 2016-08-13 05:45:37 +01:00
585321376d Fix SongSelect.
Do updated tests count?

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1608194-2.4 (revision 2650)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1724/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1635/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1573/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1334/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_T...

bzr-revno: 2648
Fixes: https://launchpad.net/bugs/1608194
2016-08-12 18:32:11 +01:00
120b299372 Update slot signatures to comply with PyQt5.6's stricter checks.
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/stricter-slot-signatures-2.4 (revision 2649)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1722/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1633/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1571/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1332/
[SUCCESS] https://ci.openlp....

bzr-revno: 2647
2016-08-12 18:30:27 +01:00
d2866a1e9c Removed a log I forgot to take out earlier 2016-08-12 13:52:35 +02:00
c4a257c9dd Remove a logging line I never wrote, and move a variable in a test that I need to mock 2016-08-12 11:23:56 +02:00
912849b22c Fix some pep8 issues 2016-08-11 23:43:13 +02:00
b3893c2c1b Fix the tests 2016-08-11 23:13:12 +02:00
ae93a6e33d Fix bug #1608194: Adapt the importer to the new CCLI SongSelect website
Fixes: https://launchpad.net/bugs/1608194
2016-08-11 16:18:49 +02:00
c3bb167b32 Fix some under-indented lines 2016-08-10 11:32:57 +02:00
e4468573dc Fix some slot signatures that were the incorrect type 2016-08-10 10:58:55 +02:00
989356c24e Fix a permission error that we should have fixed ages ago.
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/permission-error-2.4 (revision 2645)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1676/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1587/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1525/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1290/
[SUCCESS] https://ci.openlp.io/job/Branch-...

bzr-revno: 2646
2016-08-02 23:13:13 +02:00
01c6cb0f8b Fix a permission error that we should have fixed ages ago.
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/permission-error-2.4 (revision 2645)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1676/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1587/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1525/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1290/
[SUCCESS] https://ci.openlp.io/job/Branch-...

bzr-revno: 2645
2016-08-02 22:22:31 +02:00
66d7c8fca6 HEAD 2016-07-27 22:48:16 +02:00
second@tgc.dk
7d52332074 Use BibleGateway standard site instead of the legacy site. Fixes bug 1562384.
Update Crosswalk webpage parser to match new layout. Fixes bug 1599999.

bzr-revno: 2644
Fixes: https://launchpad.net/bugs/1562384, https://launchpad.net/bugs/1599999
2016-07-27 22:42:37 +02:00
Tomas Groth
a3a113021b Use BibleGateway standard site instead of the legacy site, fixes bug 1562384. Update Crosswalk webpage parser to match new layout, fixes bug 1599999.
Fixes: https://launchpad.net/bugs/1562384, https://launchpad.net/bugs/1599999
2016-07-27 21:27:14 +02:00
f3796fa3d2 Fix the permission error for once and for all 2016-07-19 22:56:31 +02:00
37e92d00a2 Release 2.4.2
bzr-revno: 2643
2016-06-25 20:20:19 +02:00
0e8ab10daf "Bugfix 1588369 - projectorNetwork signal/slot signature mismatch
- Fix projectorNetwork signal signature
- Fix projector manager projectorNetwork signature and method call
- Updated pjlink1 test
- Merge 2.4 base and fix conflicts

--------------------------------
lp:~alisonken1/openlp/bug-1588369-2.4-projectorNetwork-signal (revision 2639)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1636/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1547/
[SUCCESS] https://ci.openlp.io..."

bzr-revno: 2642
Fixes: https://launchpad.net/bugs/1588369
2016-06-25 20:11:47 +02:00
319870aa83 Merge 2.4 base - fix conflicts 2016-06-25 10:32:32 -07:00
tim.bentley@gmail.com
b19fe349d8 right translations this time
bzr-revno: 2641
2016-06-24 20:50:50 +01:00
Tim Bentley
3cede5cc63 trans 2016-06-24 19:32:18 +01:00
second@tgc.dk
a0ac63c31c Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.
bzr-revno: 2640
Fixes: https://launchpad.net/bugs/1594945
2016-06-22 22:22:26 +02:00
ecdb379082 Bugfix 1593882 and 1593883 - projector authorization backport
- Fix exception when authenticated connection requested and pin is None
- Fix pjlink authentication (use python hash instead of qt hash)
- Fix md5_hash functions
- Fix qmd5_hash functions
- Added tests for bugfixes

--------------------------------
lp:~alisonken1/openlp/2.4-bug-1593883-projector-authentication (revision 2637)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1630/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Funct...

bzr-revno: 2639
Fixes: https://launchpad.net/bugs/1593882, https://launchpad.net/bugs/1593883
2016-06-22 22:19:24 +02:00
Tomas Groth
867c32165a merge trunk 2016-06-21 23:01:53 +02:00
second@tgc.dk
9d2da2307f Fix traceback in VideoPsalm importers traceback handler.
Skip PresentationManager files we do not support.
Fix MediaShout import issue when an expected table is missing. Fixes bug 1590657.
Fix traceback during songshowplus import. Fixes bug 1585489.

bzr-revno: 2638
Fixes: https://launchpad.net/bugs/1585489, https://launchpad.net/bugs/1590657
2016-06-21 22:50:45 +02:00
Tomas Groth
db0cdd372b Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.
Fixes: https://launchpad.net/bugs/1594945
2016-06-21 22:06:10 +02:00
7abbb2abb3 bugfix 1593882 and 1593883 backports 2016-06-17 20:18:52 -07:00