raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
14,594 Commits 5 Branches 0 Tags 296 MiB
dce77d2160
Commit Graph

14594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ken Roberts
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
Ken Roberts
f7532b7896 pep8 2016-06-25 07:41:06 -07:00
Ken Roberts
d3a2dd399a Fix missing format key, updated test 2016-06-25 04:39:57 -07:00
Ken Roberts
de754e2cb1 Convert exceptionform._create_report to return dict 2016-06-24 05:39:47 -07:00
Ken Roberts
d878d8b8cb Missed closing paren 2016-06-23 21:38:18 -07:00
Ken Roberts
c2d884df48 Missing format key 2016-06-23 21:28:23 -07:00
Ken Roberts
467c672339 Typo 2016-06-22 08:07:50 -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
Ken Roberts
29043f0789 string format error 2016-06-17 08:30:23 -07:00
Ken Roberts
c8754c86aa Merge trunk fix conflict 2016-06-16 18:08:21 -07:00
suutari-olli
2ee123a9e1 - Clear the results button now also clears the text input field and gives it focus. 2016-06-17 01:27:06 +03:00
suutari-olli
1d73961216 - Added the Images by using "bzr add" 
E:\bzr\openlp\combined-reference-and-text-search>bzr add E:\bzr\openlp\combined-
reference-and-text-search\resources\images
adding resources/images/bibles_search_clear.png
adding resources/images/bibles_search_combined.png
 2016-06-17 00:48:05 +03: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
Ken Roberts
018f6f8af5 Fix spelling 2016-06-16 08:07:34 -07:00
Ken Roberts
7a8b519b8c Add test for renderer change to template string 2016-06-16 07:44:32 -07:00
Ken Roberts
b627736e5e Convert renderer string to Template() 2016-06-15 08:05:05 -07:00
suutari-olli
7c74b50318 - Code cleanup (Removed 2 un-required empty rows) 2016-06-15 00:55:37 +03:00
suutari-olli
3e926c7480 - Added "Clear search results" button to Quick & Advanced search. 
> Added a new icon for this: http://www.1001freedownloads.com/free-clipart/tango-edit-clear 
 ^^CC0 1.0 Universal (CC0 1.0)
 2016-06-15 00:49:29 +03: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
alisonken1@gmail.com
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
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
suutari-olli
d5b11c13d2 - Some code cleanup 2016-06-14 23:53:39 +03:00
Tomas Groth
4fc4fa8969 pep8 fixes 2016-06-14 22:36:51 +02:00
suutari-olli
5a54b2a660 - Improved the "Search too short" message for Quick search. 
(Reference search just uses "No search results for now")
- Reverted the attempt to stop duplicated search results if search results are locked,
  (This is something that I havn't figured out how to do)
 2016-06-14 22:54:26 +03: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
suutari-olli
65ffd10cdf - Improved the "Too short search" item functionality. 
- Improved some comments.
 2016-06-13 01:02:24 +03:00
suutari-olli
4ec7e5e879 - Added "Search too short for search while typing" message to search results 
!! Need to rename this from: search_results_banana to something smarter.
- Fixed "," breaking OLP if it's the last char in text search.
- "," no longer separates keywords in Text search. 
- Removed mention about separating keywords with "," from the empty search message.
- Started working on not duplicating search results on "Lock search results" > THIS DOES NOT WORK YET.
 2016-06-11 13:10:15 +03: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
suutari-olli
8f7f9f9804 - Removed one old comment related to old setting and old solution 2016-06-05 15:32:57 +03: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
suutari-olli
4f5abd290f - Created "def verse_search_while_typing" 
/ This does not trigger web bibles error message and is
    used during search while typing.
- Removed the new/old setting created for the old solution
 2016-06-05 14:03:28 +03:00
Ken Roberts
a4483af5b4 Revert htmlbuilder for now 2016-06-04 01:03:25 -07:00