Tim Bentley
304032cd7d
Merge and fix mess
2016-08-12 06:15:56 +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
Olli Suutari
fc3b2f021e
- Merged trunk on 10/8/16.
2016-08-10 00:37:59 +03: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
2f7a1ab456
Merge trunk
2016-08-05 12:41:22 -07: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
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
suutari-olli
b364bb5cf0
- merged trunk on 24.7.16
2016-07-24 21:56:13 +03: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
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
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
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
suutari-olli
22ff4247ad
- Merged trunk on 27.6.16
2016-06-27 02:23:50 +03:00
