suutari-olli
f5bc8056f7
- removed one unrequired if statement.
2016-07-17 19:11:51 +03:00
suutari-olli
08bcb2c5d4
- Moved them to another init since something broke
2016-07-17 18:53:27 +03:00
suutari-olli
437039efed
- Moved the 2nd new registry flag from one init to an another init which also has the 1st
2016-07-17 18:49:15 +03:00
suutari-olli
496c57cdfc
- Fixed the issue where items sent to Preview from Service may cause tracebacks.
2016-07-17 18:41:55 +03:00
suutari-olli
4874f6a218
- Reduced comments
...
- Removed unrequired reg_value from test.
2016-07-16 19:51:08 +03:00
suutari-olli
39cbafd453
Fixed the tests.
2016-07-16 18:41:39 +03:00
suutari-olli
02b4d27b96
pep8 fixes, test still broken.
2016-07-14 21:13:58 +03:00
suutari-olli
1c133398e2
Merged trunk on 14.7.16
2016-07-14 21:03:57 +03:00
suutari-olli
7b643b06ac
- Tried to make the new text work with the registry changes but failed.
...
> Test is broken, do not merge!
2016-07-14 21:02:23 +03:00
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
f911bdafa9
Format fix
2016-06-26 17:08:28 -07:00
suutari-olli
22ff4247ad
- Merged trunk on 27.6.16
2016-06-27 02:23:50 +03:00
suutari-olli
6078e28171
Comment cleanup / Improvements
2016-06-27 02:20:57 +03:00
suutari-olli
68b4d62502
- Turned the two new hidden settings into registry flags
2016-06-27 02:14:24 +03:00
8806a06ab9
Test cleanups
2016-06-17 19:45:02 -07:00
7cc56af2bb
bugfix 1593883 pjlink authenticatino test
2016-06-17 19:02:53 -07:00
7e8eb21510
Pep8 and notes about hashing
2016-06-17 16:54:04 -07:00
d1ff2385ae
bug 1593883 fix - switch from qmd5_hash to md5_hash
2016-06-17 16:48:32 -07:00
aaba690c97
Fix call to wrong signal on error
2016-06-17 16:05:26 -07:00
c64df391aa
bug 1593882 fix
2016-06-17 15:46:21 -07:00
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
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
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
suutari-olli
c249eb1f20
merged trunk on 14.6.16
2016-06-14 01:02:56 +03:00
aedcecc7ff
String format oops
2016-06-08 19:57:21 -07:00
e222a11390
String format oops
2016-06-08 13:41:21 -07:00
b84dbb15a2
Oops in string format
2016-06-08 13:26:01 -07:00
828741ec84
Remove testing verbosity flag
2016-06-07 06:21:07 -07:00
5fe54b5907
Beauty spa for the htmlbuilder
2016-06-07 06:12:22 -07:00
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
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
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
ec8ace4929
Fixed up some issues and refactored a method that wasn't actually a test.
2016-06-02 01:14:58 +02:00
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
672b8334fa
Initial attempt to move to nose2
2016-05-31 23:40:13 +02:00
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
5a6c4f90a1
Fix formatting problems
2016-05-31 18:10:31 +02:00
41dcf85cbe
"Convert strings to python3 in plugins part 4
...
- Convert strings in plugins/songusage
- Convert missed string in projector/pjlink1
- Updated projectorpjlink1 test
--------------------------------
lp:~alisonken1/openlp/strings-plugins4 (revision 2670)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1578/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1489/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1427/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_F ..."
bzr-revno: 2671
2016-05-31 17:36:28 +02:00
1782cd8274
"Convert strings from python2 to python3 in plugins part 3
...
- Convert strings in plugins/remote
- Convert strings in plugins/songs
- Update projectordb test
- Fix oops in format tag - missed escaping brace(s)
--------------------------------
lp:~alisonken1/openlp/strings-plugins3 (revision 2670)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1576/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1487/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1425/
[SUCCESS]..."
bzr-revno: 2670
2016-05-31 16:56:23 +02:00
tim.bentley@gmail.com
e841e0fbdc
"Fix formatting tags
...
Move SpellTextEdit as missed
Add working flags API's to registry
lp:~trb143/openlp/may_fixes (revision 2673)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1574/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1485/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1423/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1202/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/792/
[SUCCESS] https://ci.o ..."
bzr-revno: 2669
2016-05-31 16:03:48 +02:00