Commit Graph

14387 Commits

Author SHA1 Message Date
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
d878d8b8cb Missed closing paren 2016-06-23 21:38:18 -07:00
c2d884df48 Missing format key 2016-06-23 21:28:23 -07:00
Tim Bentley
ac841a934c Add plugin endpoints 2016-06-22 20:47:11 +01:00
467c672339 Typo 2016-06-22 08:07:50 -07:00
Tim Bentley
e642335fd3 working fixed point 2016-06-20 17:32:29 +01:00
Tim Bentley
f92701ff98 More updates 2016-06-19 18:39:48 +01:00
Tim Bentley
549598e5be cleanups 2016-06-19 09:57:38 +01:00
Tim Bentley
9e62366d2b move 2 more apis 2016-06-19 07:58:15 +01:00
Tim Bentley
36885263bb cleanup 2016-06-19 07:16:31 +01: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
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
29043f0789 string format error 2016-06-17 08:30:23 -07:00
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
Tim Bentley
8b98ee002b now upto date 2016-06-16 22:00:20 +01:00
Tim Bentley
22f85538cc stage now working again 2016-06-16 21:58:42 +01: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
968a0ab87a Add static routes for serving files, and template rendering built into endpoints 2016-06-15 23:52:46 +02:00
b627736e5e Convert renderer string to Template() 2016-06-15 08:05:05 -07:00
30ee384a9b Move the API around a bit 2016-06-15 00:03:08 +02: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
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
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
suutari-olli
d5b11c13d2 - Some code cleanup 2016-06-14 23:53:39 +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
Tomas Groth
4fc4fa8969 pep8 fixes 2016-06-14 22:36:51 +02: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
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