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

14479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tim Bentley
055280860c move main to websockets 2016-06-04 22:00:56 +01:00
Tim Bentley
251f197e45 move live view to websockets 2016-06-04 20:32:50 +01:00
Tim Bentley
ea382e18bb fix the url to be dynamic 2016-06-04 16:56:59 +01:00
Tim Bentley
4b2aa784d4 Migrate Stage view to web sockets 2016-06-04 16:45:49 +01:00
Tim Bentley
c0cc2dd141 Start of websockets in remote 2016-06-04 11:51:01 +01:00
Tim Bentley
b3c8b722e2 Start of websockets in remote 2016-06-04 11:50:43 +01:00
Ken Roberts
a4483af5b4 Revert htmlbuilder for now 2016-06-04 01:03:25 -07:00
Ken Roberts
ed7ea01f43 Tests fixes and updates 2016-06-03 22:38:51 -07:00
Ken Roberts
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
raoul@snyman.info
0355b6f221 Make all our tests nose2 compatible. They still all work with nose1 (and now a few methods that weren't actually tests don't run). 
bzr-revno: 2673
 2016-06-02 05:59:13 +01:00
Ian Knight
83e11710f2 fixed test naming issue 2016-06-02 10:45:41 +09:30
Raoul Snyman
ec8ace4929 Fixed up some issues and refactored a method that wasn't actually a test. 2016-06-02 01:14:58 +02:00
Raoul Snyman
caeb3d3ff7 Found the other tests, Mom! 2016-06-01 23:42:54 +02:00
Tim Bentley
e78fd2f503 head 2016-06-01 19:34:31 +01: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
Raoul Snyman
672b8334fa Initial attempt to move to nose2 2016-05-31 23:40:13 +02:00
raoul@snyman.info
65f108de90 Fix formatting issues. See https://code.launchpad.net/~knightrider0xd/openlp/non-text-item-height-default/+merge/295318/comments/758254 
bzr-revno: 2672
 2016-05-31 17:43:07 +01:00
Raoul Snyman
5a6c4f90a1 Fix formatting problems 2016-05-31 18:10:31 +02:00
alisonken1@gmail.com
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
alisonken1@gmail.com
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