Tim Bentley
304032cd7d
Merge and fix mess
2016-08-12 06:15:56 +01:00
Philip Ridout
83b30799ca
finished up with tests
2016-08-11 20:34:55 +01:00
Philip Ridout
0617f71134
split out web bible importers
2016-08-11 20:03:58 +01:00
Philip Ridout
5ac5c6cd68
split the web bible importers out io their own files
2016-08-11 20:02:29 +01:00
Philip Ridout
226432a3c3
head
2016-08-11 18:38:20 +01:00
Olli Suutari
50131ba202
- Merged trunk and resolved conflict that was created by ui-messages-part-1 branch.
2016-08-10 21:50:40 +03:00
suutari.olli@gmail.com
ae81497fe3
This branch includes various UI string changes, such as:
...
- Media Manager, Projector Manager, Service Manager, Theme Manager,
Preview Panel and Live Panel have been renamed to: ”Library,
Projectors, Service, Themes, Preview and Live."
- Tooltips/texts for these have been changed.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
- etc...
In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...
bzr-revno: 2688
2016-08-10 19:31:33 +01:00
c35a2d1430
String conversions with templates part 1
...
- Fix string format key error in first time wizard from previous string conversion
- Fix projector pjlink1 test to use MagicMock
- Part 1 string conversions where format template is a string variable that's filled later
- Update projectordb test
- Fix a test on htmlbuilder string formatting
- Revert openlp/core/lib/htmlbuilder.py
- Convert renderer to use Template()
- Added test for renderer css
- Merge trunk and fix conflict
- Fix formatting in excep...
2016-08-10 19:29:21 +01:00
0fc598fab5
HEAD
2016-08-10 11:13:45 +02:00
51f3a0f406
Fix some slot signatures that were the incorrect type
2016-08-10 11:07:49 +02:00
Olli Suutari
fc3b2f021e
- Merged trunk on 10/8/16.
2016-08-10 00:37:59 +03:00
Philip Ridout
9d43344a92
pep fixes
2016-08-09 21:56:04 +01:00
Philip Ridout
4866dce071
test fixes
2016-08-09 21:49:52 +01:00
Philip Ridout
f1b25ef503
Moved importers in to dedicated directory
2016-08-09 21:45:25 +01:00
Philip Ridout
b502c0b79d
Moved get file encoding from lib to common
2016-08-09 07:24:04 +01:00
Philip Ridout
a0882bd523
Refactor csv importer
2016-08-08 21:02:18 +01:00
Philip Ridout
a78c3d67e7
head
2016-08-08 19:11:32 +01:00
Philip Ridout
e9ec672756
improved encoding detection code. Tests added
2016-08-08 19:09:33 +01:00
a89495063e
merge trunk
2016-08-07 13:52:42 -07:00
1ff94a74a3
Qt5 updates for projector/signal mismatches
2016-08-07 13:51:35 -07:00
Tim Bentley
cade36a332
Head
2016-08-07 19:37:15 +01:00
suutari.olli@gmail.com
fb105f2e0b
This branch introduces following improvements to Quick Bible search:
...
- Combined Reference/Text search which first performs the Reference
search and then moves to Text search if nothing is found.
- Added Search while typing functionality for Quick Bible search
- Possibility to use “.” when shortening Book names in Reference search.
For an example Gen. 1 = Gen 1 = Genesis 1.
- New/Improved error messages
(E.g. added actual example verses to Reference error)
- 3 New settings for controllin...
bzr-revno: 2686
Fixes: https://launchpad.net/bugs/1591480
2016-08-07 19:33:46 +01:00
Philip Ridout
1abcff7519
PEP fixes
2016-08-07 12:20:53 +01:00
Philip Ridout
a4d6120bd4
Refactor xml parsing and language detection out in to a bible importer class
2016-08-07 11:15:43 +01:00
2f7a1ab456
Merge trunk
2016-08-05 12:41:22 -07:00
Philip Ridout
8257dbb282
HEAD
2016-08-03 21:27:05 +01:00
Philip Ridout
d9d740ad8b
Style fixes
2016-08-03 21:10:41 +01:00
Philip Ridout
db00a3980f
Missed tests
2016-08-03 20:56:53 +01:00
Philip Ridout
60767c8ce4
Fixes bug #917164 . A start on refactoring bibles
2016-08-03 18:26:10 +01:00
suutari-olli
7eac4d5e38
- Merged trunk on 2.8.16
2016-08-02 23:18:26 +03:00
Tomas Groth
82faa1da5e
Change pylint test so it works with nose2
2016-08-02 21:32:36 +02:00
Tomas Groth
7ca7ae9c07
Ignore distutils errors
2016-08-01 20:49:01 +02:00
Tomas Groth
76be31fee1
Only run pylint tests if specified.
2016-08-01 20:00:58 +02:00
Tomas Groth
189b2dd400
Improve pylint testing, fixed a few issues.
2016-08-01 19:42:29 +02:00
suutari-olli
1298b629f1
- Merged trunk on 31.7.16
2016-07-31 14:58:54 +03:00
suutari-olli
0923ca6a40
- Merged trunk on 28.7.16
2016-07-28 22:57:21 +03:00
Tomas Groth
449b46ab3d
merge trunk
2016-07-27 21:01:57 +02:00
0dcae022bc
some pep8 fixes
2016-07-24 22:49:00 +02:00
ea455d9b32
Write some tests
2016-07-24 22:41:27 +02:00
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
Tomas Groth
031ae9ebc1
Use BibleGateway standard site instead of the legacy site. Fixes bug 1562384.
...
Fixes: https://launchpad.net/bugs/1562384
2016-07-24 21:49:29 +02:00
suutari-olli
b364bb5cf0
- merged trunk on 24.7.16
2016-07-24 21:56:13 +03:00
e231398010
HEAD
2016-07-24 14:25:46 +02:00
Tim Bentley
6ea956f432
fix tests
2016-07-23 06:24:28 +01:00
Tim Bentley
6d9d2ef32e
remove broken test
2016-07-23 06:14:20 +01:00
Tim Bentley
a4ce16809e
remove directory
2016-07-23 06:00:01 +01:00
Tim Bentley
ca2ceba972
Head
2016-07-23 05:59:26 +01:00
Tim Bentley
25a43669d7
fix test
2016-07-23 05:48:36 +01: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
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
Tim Bentley
ea846abab2
clean up tests
2016-07-20 20:59:02 +01:00
Tim Bentley
2c85e3cb36
more tests
2016-07-19 21:47:55 +01:00
a8b72ed876
Fix up the types in the signals and slots - PyQt 5.6 is stricter about them now.
2016-07-18 23:36:16 +02:00
785257020d
Fix some linting issues
2016-07-17 21:46:06 +02:00
65fe62d69f
Fix some linting issues
2016-07-17 21:33:10 +02:00
97d6586462
Fixed another part of the permission denied error
2016-07-17 21:12:00 +02:00
Tim Bentley
6e5070316c
next prev
2016-07-17 08:12:42 +01:00
3cdd42bfe0
Catch the PermissionError too
2016-07-17 00:20:56 +02: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
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
Tim Bentley
70288c8ae1
More fixes
2016-07-10 07:25:25 +01:00
Tim Bentley
3a7aff9c0e
migrate settings
2016-07-09 12:21:25 +01:00
Tim Bentley
27a6af8ab1
fix test
2016-07-09 10:25:49 +01:00
Tim Bentley
b9101d97fd
fix test
2016-07-09 09:49:57 +01:00
Tim Bentley
4b0b8b9647
fix test
2016-07-09 09:45:08 +01:00
de3f4046b7
Convert md5sum calls to utf-8 for non-ascii pins
2016-07-08 12:19:08 -07:00
Tim Bentley
76af52b2bf
Bye Bye Remote
2016-07-08 18:10:18 +01:00
Tomas Groth
93fc6e0145
Update Crosswalk webpage parser to match new layout. Fixes bug 1599999.
...
Fixes: https://launchpad.net/bugs/1599999
2016-07-07 22:56:50 +02:00
Tomas Groth
8009bfef85
forgot test file
2016-07-07 22:48:52 +02:00
Tomas Groth
69951133fe
Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.
...
Fixes: https://launchpad.net/bugs/1594945
2016-07-07 22:47:57 +02:00
Tomas Groth
1992a51339
More pylint-fixes
2016-07-06 21:48:57 +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
Tim Bentley
a81cc8292b
fix some tests
2016-06-28 22:39:16 +01: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
suutari-olli
22ff4247ad
- Merged trunk on 27.6.16
2016-06-27 02:23:50 +03:00
f7532b7896
pep8
2016-06-25 07:41:06 -07:00
d3a2dd399a
Fix missing format key, updated test
2016-06-25 04:39:57 -07:00
de754e2cb1
Convert exceptionform._create_report to return dict
2016-06-24 05:39:47 -07:00
Tim Bentley
fa5ce45db0
it works
2016-06-19 07:16:01 +01: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
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
c8754c86aa
Merge trunk fix conflict
2016-06-16 18:08:21 -07:00
Tim Bentley
3d602d41b3
First changes now working
2016-06-16 21:50:01 +01: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
suutari-olli
7c74b50318
- Code cleanup (Removed 2 un-required empty rows)
2016-06-15 00:55:37 +03: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
Tim Bentley
6b83cfce5f
tests
2016-06-14 21:59:32 +01:00
Tim Bentley
f8ca67b67e
pep8
2016-06-14 21:56:50 +01:00
suutari-olli
db003d7ec6
- Merged trunk on 14.6.16
...
To do?
- Add clear search results button for locked Bible search results
- Prevent duplicated search results on "Lock search results"
2016-06-14 23:54:36 +03:00
Tim Bentley
ed28ad2ebc
fix tests
2016-06-14 21:48:32 +01:00
Tim Bentley
dc4d7fcfb1
move files
2016-06-14 21:43:25 +01:00
Tim Bentley
5a0f2f1781
fix tests
2016-06-14 21:18:20 +01:00
Tim Bentley
7d049eb2af
Rename Classes
2016-06-14 21:12:04 +01: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
Tim Bentley
4a76b3d26d
Add another test
2016-06-13 20:56:17 +01:00
Tim Bentley
f951dbff9f
Add another test
2016-06-13 20:51:46 +01:00
Tim Bentley
88baa041f2
Yet another test
2016-06-12 17:22:48 +01:00
Tim Bentley
ece03a8024
Another test
2016-06-12 15:50:20 +01:00
Tim Bentley
6a81063fe7
Test apicontroiler
2016-06-11 22:13:48 +01:00
Tim Bentley
7558395b54
API Tests 1
2016-06-11 19:50:39 +01:00
Tim Bentley
6a955a5573
api and router work, move settings and tab
2016-06-10 17:16:35 +01:00
Tim Bentley
fa97bfce10
pep8
2016-06-07 17:56:21 +01: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
Tim Bentley
2b0e61d5fd
Too many changes
2016-06-05 22:26:06 +01:00
Tim Bentley
32fad35f79
move remote to api and add waitress
2016-06-05 22:16:13 +01:00
Tim Bentley
fad8b35660
Add tests for new registry function
2016-06-05 21:36:42 +01:00
Tim Bentley
05be4e606c
Fix up tests
2016-06-05 19:48:07 +01:00
suutari-olli
9990472586
- Merged trunk on 5.6.16
...
- Removed some additional error messages from "Search while typing"
(Count verses not found in both bibles, no Bibles installed)
2016-06-05 15:15:51 +03: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
suutari-olli
dcfcd3e576
- Merged trunk on 21.5.16
2016-05-21 00:45:14 +03: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
suutari-olli
165d8cd4ba
- Merged trunk on 18.5.2016 20:57
2016-05-18 20:56:50 +03:00