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

13662 Commits

Author SHA1 Message Date
Ken Roberts 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
Ken Roberts 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
Ken Roberts 7abbb2abb3 bugfix 1593882 and 1593883 backports 2016-06-17 20:18:52 -07:00
Tomas Groth cadc21b5c0 Fix traceback in VideoPsalm importers traceback handler. 2016-06-16 23:00:13 +02:00
Tomas Groth 7265065906 Skip PresentationManager files we do not support. 2016-06-16 22:59:31 +02:00
Tomas Groth 8f04f587ec Fix MediaShout import issue when an expected table is missing. Fixes bug 1590657. 
Fixes: https://launchpad.net/bugs/1590657
 2016-06-16 22:58:11 +02:00
Tomas Groth 8057d13db6 Fix traceback during songshowplus import. Fixes bug 1585489. 
Fixes: https://launchpad.net/bugs/1585489
 2016-06-16 22:54:10 +02:00
raoul@snyman.info 7ad464d43e Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left. 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1589815-2.4 (revision 2637)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1604/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1515/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1453/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1226/
[...

bzr-revno: 2637
 2016-06-14 22:09:52 +01:00
Raoul Snyman 19a5272e5a Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left. 2016-06-08 11:09:56 +02:00
Ken Roberts 9ba66f29da pep8 2016-06-02 23:36:38 -07:00
Ken Roberts 2dd4c87dde Bugfix 1588369 - projectorNetwork signal/slot signature mismatch 2016-06-02 23:26:04 -07:00
Tim Bentley 2a1786ec00 Translations 
bzr-revno: 2636
 2016-05-26 17:24:29 +01:00
Tim Bentley a050e41589 trans242505 2016-05-25 20:11:36 +01:00
second@tgc.dk d8d6917b7d Fix of tracback during SongPro import. Fixes bug 1582152. 
Backport of song-search-fix from trunk
Added support for using the new mutool in mudraw mode
Fix crosswalk bible list download
Fix traceback if bible list download fails.

bzr-revno: 2635
Fixes: https://launchpad.net/bugs/1579648, https://launchpad.net/bugs/1582152
 2016-05-24 17:16:57 +01:00
tim.bentley@gmail.com d6a433c2fc Fix Android SSL 
Fix Service Manager
Fix Formatting Tags
Add test

bzr-revno: 2634
 2016-05-24 17:15:49 +01:00
Tomas Groth 505e6de924 Merge 2.4.x trunk 2016-05-24 12:58:51 +02:00
Tomas Groth 8a53e4a991 pep8 fixes 
bzr-revno: 2633
 2016-05-24 12:56:51 +02:00
Tomas Groth d5c9fd33c5 Merge 2.4.x trunk 2016-05-24 12:53:47 +02:00
Tim Bentley ff541f36ed with test 2016-05-23 19:26:03 +01:00
Tim Bentley d78ed92c4e fixes 2016-05-23 19:15:07 +01:00
Tomas Groth a2b19858b9 pep8 fix 2016-05-16 22:30:33 +02:00
Tomas Groth 935200731c Fix a backported test. 2016-05-16 22:07:11 +02:00
Tomas Groth eb15f09a47 Fix of tracback during SongPro import. Fixes bug 1582152. 
Fixes: https://launchpad.net/bugs/1582152
 2016-05-16 12:15:53 +02:00
Tomas Groth 94a8057a6a Backport of fix from trunk 2016-05-16 12:14:37 +02:00
raoul@snyman.info 8a6955fda1 Fix the Transifex API URL 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/transifex-api-2.4 (revision 2632)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1536/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1447/
[FAILURE] https://ci.openlp.io/job/Branch-03-Interface-Tests/1385/

bzr-revno: 2632
 2016-05-13 17:32:46 +01:00
raoul@snyman.info af54780de5 "Fix the Transifex API URL 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/transifex-api-2.4 (revision 2632)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1536/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1447/
[FAILURE] https://ci.openlp.io/job/Branch-03-Interface-Tests/1385/"

bzr-revno: 2631
 2016-05-12 22:30:52 +02:00
Tomas Groth df840d7705 fix backport error 2016-05-10 21:11:14 +02:00
Tomas Groth a34cbab35c Added support for using the new mutool in mudraw mode 2016-05-09 21:44:14 +02:00
Tomas Groth f843236059 Fix crosswalk bible list download 2016-05-09 21:41:23 +02:00
Tomas Groth 2e41c5e6fa Fix traceback if bible list download fails. 2016-05-09 21:40:09 +02:00
Raoul Snyman 150ced331b Fix test after backport from trunk 2016-05-07 18:15:02 +02:00
Raoul Snyman dcf78ae592 Update the Transifex API URL 2016-05-05 22:35:04 +02:00
Raoul Snyman 4ee29b0e3d Release 2.4.1 
bzr-revno: 2630
 2016-04-30 21:20:28 +02:00
raoul@snyman.info 654241246d Show a message asking the user if they want to remove a file that doesn't exist 
bzr-revno: 2629
Fixes: https://launchpad.net/bugs/1559336
 2016-04-29 22:19:27 +01:00
Raoul Snyman a75953c3d8 Add a test 2016-04-29 22:52:37 +02:00
Raoul Snyman e505950d3f HEAD 2016-04-29 22:15:41 +02:00
s.mehrbrodt@gmail.com f32d95c200 Fix performance regression with Songbook search 
The problem was that in each iteration the database was accessed (the song object).
Fixed this by loading all neccessary information directly in the query.

Also this reintroduces natural sorting.

bzr-revno: 2628
Fixes: https://launchpad.net/bugs/1552563
 2016-04-29 19:42:14 +01:00
Samuel Mehrbrodt ef89796e33 pep8 2016-04-29 19:48:40 +02:00
Samuel Mehrbrodt 6e901e336c Fix performance regression in songbook search 
Fixes: https://launchpad.net/bugs/1552563
 2016-04-29 19:39:52 +02:00
Raoul Snyman 79285ce759 Show a message asking the user if they want to remove a file that doesn't exist 
Fixes: https://launchpad.net/bugs/1559336
 2016-04-28 23:12:50 +02:00
Tim Bentley c744a9fa59 tranlations 
bzr-revno: 2627
 2016-04-28 19:19:47 +01:00
raoul@snyman.info 475ab2af3a "Fix bug #1557514 by auto-detecting the columns of the tables in the songs database 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1557514-2.4 (revision 2625)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1502/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1413/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1351/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1147/
[SUCCESS] https://ci.op..."

bzr-revno: 2626
Fixes: https://launchpad.net/bugs/1557514
 2016-04-27 23:26:14 +02:00
Raoul Snyman 411953285d Fix bug #1557514 by autodetecting the columns of the tables in the songs database 
Fixes: https://launchpad.net/bugs/1557514
 2016-04-27 20:45:39 +02:00
ian@knightly.xyz 76f8349e34 Adds QR code and links to the remotes settings for the new iOS app and test to HTML Builder. 
lp:~knightrider0xd/openlp/ios-app-2.4 (revision 2627)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1500/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1411/
Currently failing Jenkins interface tests due to unrelated bug, but tested & pep8 passing.

bzr-revno: 2625
 2016-04-27 18:00:36 +01:00