Commit Graph

14352 Commits

Author SHA1 Message Date
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
Ken Roberts 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
Ken Roberts 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
tim.bentley@gmail.com e841e0fbdc "Fix formatting tags
Move SpellTextEdit as missed
Add working flags API's to registry


lp:~trb143/openlp/may_fixes (revision 2673)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1574/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1485/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1423/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1202/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/792/
[SUCCESS] https://ci.o..."

bzr-revno: 2669
2016-05-31 16:03:48 +02:00
Ken Roberts c27b676c8c pep8 2016-05-27 22:55:54 -07:00
Ken Roberts 546030b64d Convert strings to python3 in plugins part 4 2016-05-27 22:50:31 -07:00
Ken Roberts 96333b3f08 Oops in foramt - missed escaping brace(s) 2016-05-27 01:29:31 -07:00
Ken Roberts 9fdcd30c65 Convert strings from python2 to python3 in plugins part 3 2016-05-27 01:13:14 -07:00
Tomas Groth 11e7ff5621 trunk 2016-05-26 15:09:03 +02:00
Tomas Groth 3163d33543 Fix of tracback during SongPro import. Fixes bug 1582152.
Fixes: https://launchpad.net/bugs/1582152
2016-05-26 15:03:00 +02:00
Tomas Groth fd4cfd1eaa Fix traceback during songshowplus import. Fixes bug 1585489.
Fixes: https://launchpad.net/bugs/1585489
2016-05-25 09:04:41 +02:00
Tim Bentley 32ef88f807 Fix set_value and adjust tests 2016-05-24 17:28:11 +01:00
Tim Bentley c13b922148 head 2016-05-24 17:18:45 +01:00
Ken Roberts 473772c505 Convert strings in plugins part 2
- Convert strings in custom
- Convert strings in images
- Convert strings in media
- Convert strings in presentations
- Update projector-pjlink test

--------------------------------
lp:~alisonken1/openlp/strings-plugins2 (revision 2667)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1571/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1482/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1420/
[SUCCESS] https://ci.openlp.io/jo...

bzr-revno: 2668
2016-05-24 17:18:25 +01:00
Ken Roberts f94d8e6ac2 Update strings to python3 format in plugins part 1
- Convert strings in alert plugin
- Convert strings in bible plugin
- Update bible plugin test
- Update projectordb test

--------------------------------
lp:~alisonken1/openlp/strings-plugins1 (revision 2667)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1570/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1481/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1419/
[SUCCESS] https://ci.openlp.io/job/Branch-04...

bzr-revno: 2667
2016-05-24 17:17:49 +01:00
Tomas Groth 72120d8b2f Skip PresentationManager files we do not support. 2016-05-24 13:49:08 +02:00
Tomas Groth 90f927ae7f Fix traceback while handling traceback in videopsalm import 2016-05-24 13:40:01 +02:00
Tim Bentley 6d3ad3af3f Improve performance 2016-05-21 20:01:50 +01:00
Ken Roberts 801f508a72 Convert strings in plugins part 2 2016-05-21 11:19:18 -07:00
Ken Roberts d52cebdfca Update strings in alerts and bible plugins to python3 2016-05-21 01:31:24 -07:00
Tim Bentley af36dc4c41 pep8 2016-05-21 06:28:13 +01:00
Tim Bentley d0f6d21774 Add Working flags 2016-05-21 06:24:05 +01:00
Tim Bentley 1ea5d72d1e fix formatting tags and move SpellText Edit 2016-05-21 06:02:31 +01:00
Tim Bentley 9751f5d8e5 head 2016-05-21 05:26:27 +01:00
suutari-olli cabca18de5 - Removed unrequired % s complications from short search messsage. 2016-05-21 01:10:10 +03:00
suutari-olli 0a0a87078b - Removed the unrequired %s complications from "No Bibles installed" 2016-05-21 01:02:40 +03:00
suutari-olli dcfcd3e576 - Merged trunk on 21.5.16 2016-05-21 00:45:14 +03:00
Ken Roberts 0ca7390a9a "- Convert strings in openlp/core/ui files
- Updated projectordb test

--------------------------------
lp:~alisonken1/openlp/strings-core-ui (revision 2667)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1566/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1477/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1415/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1195/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/78..."

bzr-revno: 2666
2016-05-20 22:52:22 +02:00
Ken Roberts 7f5096d0f9 core_lib files string conversions 2016-05-20 09:22:06 -07:00
Ian Knight e09e867ad1 Pep8 Errors 2016-05-20 23:07:23 +09:30