c8754c86aa
Merge trunk fix conflict
2016-06-16 18:08:21 -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
018f6f8af5
Fix spelling
2016-06-16 08:07:34 -07:00
7a8b519b8c
Add test for renderer change to template string
2016-06-16 07:44:32 -07: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
Tomas Groth
e89803a3ad
merge trunk
2016-06-14 21:06:54 +02: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
ed7ea01f43
Tests fixes and updates
2016-06-03 22:38:51 -07:00
598d715de6
Initial string conversions for variable templates
2016-06-03 17:15:19 -07: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
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
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
c27b676c8c
pep8
2016-05-27 22:55:54 -07:00
546030b64d
Convert strings to python3 in plugins part 4
2016-05-27 22:50:31 -07:00
9fdcd30c65
Convert strings from python2 to python3 in plugins part 3
2016-05-27 01:13:14 -07:00
Tomas Groth
11e7ff5621
trunk
2016-05-26 15:09:03 +02:00
Tomas Groth
fd4cfd1eaa
Fix traceback during songshowplus import. Fixes bug 1585489.
...
Fixes: https://launchpad.net/bugs/1585489
2016-05-25 09:04:41 +02:00
Tim Bentley
32ef88f807
Fix set_value and adjust tests
2016-05-24 17:28:11 +01:00
Tim Bentley
c13b922148
head
2016-05-24 17:18:45 +01:00
473772c505
Convert strings in plugins part 2
...
- Convert strings in custom
- Convert strings in images
- Convert strings in media
- Convert strings in presentations
- Update projector-pjlink test
--------------------------------
lp:~alisonken1/openlp/strings-plugins2 (revision 2667)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1571/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1482/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1420/
[SUCCESS] https://ci.openlp.io/jo ...
bzr-revno: 2668
2016-05-24 17:18:25 +01:00
801f508a72
Convert strings in plugins part 2
2016-05-21 11:19:18 -07:00
d52cebdfca
Update strings in alerts and bible plugins to python3
2016-05-21 01:31:24 -07:00
Tim Bentley
d0f6d21774
Add Working flags
2016-05-21 06:24:05 +01:00
7f5096d0f9
core_lib files string conversions
2016-05-20 09:22:06 -07:00
Ian Knight
e09e867ad1
Pep8 Errors
2016-05-20 23:07:23 +09:30
Ian Knight
2c1c7810b9
Improved test coverage.
2016-05-20 22:57:52 +09:30
Ian Knight
812c124528
Added test case for Auto option.
2016-05-20 22:06:59 +09:30
Tim Bentley
8507d3e263
fixes
2016-05-18 18:25:16 +01:00
Tim Bentley
fd33d9a0c5
fixes
2016-05-18 18:16:40 +01:00
Tim Bentley
7c1e922f10
pep8
2016-05-18 18:06:25 +01:00
306f027b53
Convert strings from python2 to python3 format
...
- Strings converted except as noted
- Updated projector pjlink test
- Simplify lines with multiple references to single variable
--------------------------------
lp:~alisonken1/openlp/strings-lib (revision 2665)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1559/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1470/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1408/
[SUCCESS] https://ci.openlp.io/job/Branch-04a ...
bzr-revno: 2664
2016-05-17 22:22:24 +01:00
Tim Bentley
8cf6b2df3e
Service Manager themes are not updated in service items when the settings theme is changed
...
bzr-revno: 2663
2016-05-17 22:19:20 +01:00
Simon Hanna
f3e1194956
Add comments to test
2016-05-17 21:35:25 +02:00
Simon Hanna
6bbf783a2e
Add test
2016-05-17 21:31:56 +02:00
ian@knightly.xyz
05e9e5dca0
Fixes bug 1080596 where presentations in the preview pane display live view rather than preview of selected slide.
...
In addition, fixes the aspect ratio & quality of thumbnails by saving them in the correct aspect ratio at a higher resolution, and loading them through the image manager.
New test cases implemented, or existing cases modified to test coverage complete for changes.
lp:~knightrider0xd/openlp/preview-shows-live-fix-1080596 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch- ...
bzr-revno: 2661
Fixes: https://launchpad.net/bugs/1080596
2016-05-16 17:26:29 +01:00
Ian Knight
a7466f1ea7
Check for Div0 and added unit test cases
2016-05-16 22:05:58 +09:30
7c4671b676
Convert strings to python3 in core.common.lib
2016-05-15 10:33:42 -07:00
07468f0093
Fix oops
2016-05-15 10:32:04 -07:00
f51132e876
core/common convert strings to python3 format
2016-05-13 21:24:46 -07:00
