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

14352 Commits

Author SHA1 Message Date
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
Ken Roberts 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
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
suutari-olli 65ffd10cdf - Improved the "Too short search" item functionality. 
- Improved some comments.
 2016-06-13 01:02:24 +03: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 4a30e71a79 Stage works! 2016-06-11 17:28:50 +01: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
Tim Bentley 6a955a5573 api and router work, move settings and tab 2016-06-10 17:16:35 +01: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
Tim Bentley fa97bfce10 pep8 2016-06-07 17:56:21 +01: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
Tim Bentley 25ca35f420 Fix up to work with python 3.4 and 3.5 take 2 2016-06-06 21:33:28 +01:00
Tim Bentley ba1eac8cd3 Fix up to work with python 3.4 and 3.5 2016-06-06 21:27:55 +01:00
Tim Bentley ad485bd2c9 Fix up threads to work 2016-06-06 20:56:38 +01:00
Tim Bentley b8b05bb665 Fixes 2016-06-06 17:44:14 +01:00
Ken Roberts 2443b94eda Convert htmlbuilder strings to Template() 2016-06-06 08:16:09 -07:00
Tim Bentley 15bf9420ae Rename Controller 2016-06-05 22:28:35 +01: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
Tim Bentley e0d8198626 stop excess logging 2016-06-05 17:21:52 +01:00
Tim Bentley a5f460dc76 Bye Bye SSL 2016-06-05 17:20:39 +01:00
Tim Bentley 41d3ea59a0 more updates 2016-06-05 15:56:01 +01: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
Tim Bentley 8ce073d83f Move Websockets to core from plugin 2016-06-05 06:49:27 +01:00