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

15727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tomas Groth
75e9291603 Added transpose buttons to song lyric editor - not functional yet. 2016-06-05 22:31:23 +02:00
Tomas Groth
82d5c6dcb2 Make chords.js a bit more readable. 2016-06-05 22:30:22 +02: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
Tomas Groth
e51ffd9759 Removed resizing buttons and reuse the stage.css 2016-06-02 15:54:44 +02:00
Tomas Groth
5f36fcbf39 Added chord settings to the song tab. 2016-06-02 15:53:30 +02: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
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
Tomas Groth
d9510625eb Started implementing support for multiple notations, for now english, german and neo-latin is supported. 2016-05-28 23:53:49 +02:00
Tomas Groth
13dd532269 Moved chords to a new web view. 2016-05-28 23:11:59 +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
374e40e242 Only show stage chords controls if enabled in settings. 2016-05-27 08:45:23 +02:00
Tomas Groth
12c2b5e578 Removed leftovers from merge with trunk 2016-05-27 08:41:38 +02:00
Tomas Groth
11e7ff5621 trunk 2016-05-26 15:09:03 +02:00