Commit Graph

14109 Commits

Author SHA1 Message Date
suutari-olli aa1cd8fa91 - Merged trunk on 24.7.16
- Added superflys startup traceback fix to my code
- Resolved conflicts
2016-07-24 23:20:25 +03:00
suutari-olli 0c8503a266 - Changed stuff based on comments by TRB143. 2016-07-24 22:58:34 +03:00
second@tgc.dk c426b8c1a2 "Added a test using pylint to test the code for the most serious issues.
Added pylintrc for finding more potential issues with pylint (not used in the test).
Made some fixes as suggested by pylint."

bzr-revno: 2681
2016-07-21 23:32:25 +02:00
Ken Roberts 0150291e4d "- Convert calls to md5_hash and qmd5_hash to use UTF-8 for non-ascii characters
- Fixed test to verify UTF-8 returns valid ASCII hash
- Switch back to qmd5_hash to stay within the Qt framework

--------------------------------
lp:~alisonken1/openlp/projector-cleanups (revision 2679)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1646/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1557/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1495/
[SUCCESS] https://ci.o..."

bzr-revno: 2680
2016-07-21 23:29:58 +02:00
raoul@snyman.info 0b8b88a587 "Fix a permission error that people keep on getting but we never actually log and fix.
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/permission-error (revision 2682)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1656/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1567/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1505/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1271/
[SUCCESS] https://c..."

bzr-revno: 2679
2016-07-21 23:26:09 +02:00
Raoul Snyman 785257020d Fix some linting issues 2016-07-17 21:46:06 +02:00
Raoul Snyman 65fe62d69f Fix some linting issues 2016-07-17 21:33:10 +02:00
Raoul Snyman 97d6586462 Fixed another part of the permission denied error 2016-07-17 21:12:00 +02:00
Raoul Snyman 3cdd42bfe0 Catch the PermissionError too 2016-07-17 00:20:56 +02:00
Ken Roberts de3f4046b7 Convert md5sum calls to utf-8 for non-ascii pins 2016-07-08 12:19:08 -07:00
Ken Roberts 8fcf42cdc3 Bugfix 1593882 and 1593883 - projector authorization
- 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 qmd5hash functions
- Added tests for bugfixes
Tested with test server and Eiki XL200 projector

--------------------------------
lp:~alisonken1/openlp/bug-1593883-projector-authentication (revision 2684)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1629/
[SUCCESS] https...

bzr-revno: 2678
Fixes: https://launchpad.net/bugs/1596380
2016-07-07 22:36:55 +02:00
Tomas Groth 1992a51339 More pylint-fixes 2016-07-06 21:48:57 +02:00
Tomas Groth 99e6ab6657 Fix various issues as suggested by pylint 2016-07-05 22:31:29 +02:00
Tomas Groth 9294aadae9 Changes to pylint test 2016-07-05 22:30:33 +02:00
Tomas Groth 8aa917c89c A bunch of fixes suggested by pylint. 2016-07-01 23:17:20 +02:00
Tomas Groth 1cf078be76 Add pylintrc file 2016-07-01 23:14:24 +02:00
Tomas Groth 668f10a14b more pylint 2016-06-28 22:44:50 +02:00
Tomas Groth 04cb827911 Started work on using pylint for code analysing. 2016-06-27 23:19:53 +02:00
Ken Roberts f911bdafa9 Format fix 2016-06-26 17:08:28 -07:00
Ken Roberts 8806a06ab9 Test cleanups 2016-06-17 19:45:02 -07:00
Ken Roberts 7cc56af2bb bugfix 1593883 pjlink authenticatino test 2016-06-17 19:02:53 -07:00
Ken Roberts 7e8eb21510 Pep8 and notes about hashing 2016-06-17 16:54:04 -07:00
Ken Roberts d1ff2385ae bug 1593883 fix - switch from qmd5_hash to md5_hash 2016-06-17 16:48:32 -07:00
Ken Roberts aaba690c97 Fix call to wrong signal on error 2016-06-17 16:05:26 -07:00
Ken Roberts c64df391aa bug 1593882 fix 2016-06-17 15:46:21 -07:00
Ken Roberts 76ffe35621 bug 1593882 - fix authenticated connection but bin not set 2016-06-17 15:06:55 -07:00
second@tgc.dk 45d2640159 "Fix various pyodbc related issues. Fixes bug 1590657.
Fix of tracback during SongPro import. Fixes bug 1582152.
Fix traceback during songshowplus import. Fixes bug 1585489.
Skip PresentationManager files we do not support."

bzr-revno: 2677
Fixes: https://launchpad.net/bugs/1582152, https://launchpad.net/bugs/1585489, https://launchpad.net/bugs/1590657
2016-06-16 22:12:27 +02:00
raoul@snyman.info f052cf99d9 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 (revision 2675)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1603/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1514/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1452/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1225/
[SUCC...

bzr-revno: 2676
2016-06-14 22:07:18 +01:00
Ken Roberts f20499b1af Convert htmlbuilder.py to use Template() strings for css
- Changed strings to use Template() instead of format() for css building
- Fix htmlbuilder strings tests
- Cleanup template variables and fix tests to match
- bug 1590386 - string format error in editbibledialog.py
- bug 1590475 - string format error in mediaitem.py
- Function call error in firsttimeform.py (missed label text variable)

--------------------------------
lp:~alisonken1/openlp/strings-templates2 (revision 2679)
[SUCCESS] ...

bzr-revno: 2675
Fixes: https://launchpad.net/bugs/1590386, https://launchpad.net/bugs/1590475
2016-06-14 22:05:51 +01:00
Tomas Groth 4fc4fa8969 pep8 fixes 2016-06-14 22:36:51 +02:00
Tomas Groth 41c0d3fcf9 Fix various pyodbc related issues. Fixes bug 1590657.
Fixes: https://launchpad.net/bugs/1590657
2016-06-14 21:11:57 +02:00
Tomas Groth e89803a3ad merge trunk 2016-06-14 21:06:54 +02:00
Ken Roberts aedcecc7ff String format oops 2016-06-08 19:57:21 -07:00
Ken Roberts e222a11390 String format oops 2016-06-08 13:41:21 -07:00
Ken Roberts b84dbb15a2 Oops in string format 2016-06-08 13:26:01 -07:00
Ken Roberts 828741ec84 Remove testing verbosity flag 2016-06-07 06:21:07 -07:00
Ken Roberts 5fe54b5907 Beauty spa for the htmlbuilder 2016-06-07 06:12:22 -07:00
Raoul Snyman 0d2745a1d1 Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left. 2016-06-07 09:35:06 +02:00
Ken Roberts 2443b94eda Convert htmlbuilder strings to Template() 2016-06-06 08:16:09 -07:00
ian@knightly.xyz d690366595 Adds automatic functionality to the max-height for non-text items feature, and sets this as the default value.
Advanced tab spin box replaced with combo box.

Test coverage expanded on other functions in listpreviewwidget and pep8 errors fixed.
Fixed test naming.
Merged with trunk as of 2016-06-02_10:30.

lp:~knightrider0xd/openlp/non-text-item-height-default (revision 2674)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1584/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1...

bzr-revno: 2674
2016-06-05 15:09:57 +01:00
Ian Knight 47da0a1c8b Fixed PEP8 Errors 2016-06-02 20:02:34 +09:30
Ian Knight 179bc00fc9 Updated from trunk 2016-06-02 19:57:30 +09:30
raoul@snyman.info 0355b6f221 Make all our tests nose2 compatible. They still all work with nose1 (and now a few methods that weren't actually tests don't run).
bzr-revno: 2673
2016-06-02 05:59:13 +01:00
Ian Knight 83e11710f2 fixed test naming issue 2016-06-02 10:45:41 +09:30
Raoul Snyman ec8ace4929 Fixed up some issues and refactored a method that wasn't actually a test. 2016-06-02 01:14:58 +02:00
Raoul Snyman caeb3d3ff7 Found the other tests, Mom! 2016-06-01 23:42:54 +02:00
Ian Knight 3627976132 fixed pep8 error 2016-06-01 13:51:44 +09:30
Ian Knight 7599429065 Merge from trunk 2016-06-01 13:45:43 +09:30
Raoul Snyman 672b8334fa Initial attempt to move to nose2 2016-05-31 23:40:13 +02:00
raoul@snyman.info 65f108de90 Fix formatting issues. See https://code.launchpad.net/~knightrider0xd/openlp/non-text-item-height-default/+merge/295318/comments/758254
bzr-revno: 2672
2016-05-31 17:43:07 +01:00