Tomas Groth
9ae1af72c7
Minor adjustsments + a test.
2017-03-17 22:12:29 +01:00
Tomas Groth
31ee3999c0
merge lastest trunk
2017-03-15 20:51:10 +01:00
simon.hanna@serve-me.info
0307a1acf5
Minor fix that makes sure that songbeamer files get decoded properly.
...
bzr-revno: 2727
2017-03-13 17:56:42 +00:00
Simon Hanna
e97c157a19
Add comment
2017-03-13 13:43:55 +01:00
Simon Hanna
f7c944acc9
Add test
2017-03-13 13:42:20 +01:00
Simon Hanna
172625b193
Make sure songbeamer songs are decoded correctly
2017-03-13 13:16:12 +01:00
c256477919
Formalise the merge script
2017-03-11 22:48:23 -07:00
05a39cb7ea
Fix a test that was causing a segfault
2017-03-10 16:46:14 -07:00
3d39e2c77d
Ignore a test that is causing a segfault
2017-03-10 16:20:44 -07:00
4bae0fcd69
Fix up two tests
2017-03-10 15:48:59 -07:00
324652c347
Port some bugfixes from 2.4 to trunk
2017-03-09 22:42:38 -07:00
Tim Bentley
9451e4def6
add switch to turn off servers
2017-03-05 17:43:18 +00:00
Tim Bentley
699342c89d
pep8
2017-03-05 17:07:21 +00:00
Tim Bentley
cb9ac8cde2
fix tests
2017-03-05 17:00:21 +00:00
Tim Bentley
1bcb6415c1
fix tests
2017-03-05 16:55:58 +00:00
Tim Bentley
9c3195d166
fix tests
2017-03-05 16:36:16 +00:00
Tim Bentley
71f91e5d15
fix broken plugin
2017-03-05 10:08:05 +00:00
Tim Bentley
ef6252bf4b
FTW working and UI Strings
2017-03-05 10:02:22 +00:00
Tim Bentley
06baf5c560
fix up deploy unzip
2017-03-05 09:32:11 +00:00
Tim Bentley
7a72b2cad4
download and deploy works
2017-03-05 09:23:28 +00:00
Tim Bentley
9204dc23a0
add tests
2017-03-04 19:24:44 +00:00
Tim Bentley
b3fb5764c6
fix years
2017-03-04 19:17:59 +00:00
Tim Bentley
d3d36864f6
head remove ssl
2017-03-04 18:27:15 +00:00
tim.bentley@gmail.com
e5abad85a7
Will SSL being removed in 2.8 it and not supported in Android and iOS lets prevent it from living in 2.6.
...
Just removed the SSL code to stop the settings and not start the SSL server full removal will be in 2.8 when we change server infrastructure,
With test this time.
lp:~trb143/openlp/removessl26 (revision 2728)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1921/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1832/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Te ...
bzr-revno: 2726
2017-03-04 17:41:53 +00:00
Tim Bentley
f76e030ac9
more cleanups
2017-03-04 17:32:47 +00:00
Tim Bentley
df77c3ebd9
add test
2017-03-04 16:51:51 +00:00
Tim Bentley
0e54621999
test fix
2017-03-04 10:28:07 +00:00
Tim Bentley
c0eb055041
Remove ssl from build
2017-03-04 10:24:53 +00:00
Tim Bentley
8b0f64317c
fix up change to xdb and handle missing remotes directories
2017-03-04 09:45:14 +00:00
Tim Bentley
5d917de2f8
Head
2017-03-03 19:27:31 +00:00
196a6f95f1
Fix bug #1666005 and bug #1668994
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/off-by-one (revision 2725)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1914/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1825/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1766/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1089/
[...
bzr-revno: 2725
2017-03-02 17:58:46 +00:00
d44244a1e3
Fix bug #1668669 by reducing the height of the settings window
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1668669 (revision 2724)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1909/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1820/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1760/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1494/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-W ...
bzr-revno: 2724
2017-03-02 17:55:25 +00:00
094b1f73bc
Fix a test
2017-03-01 21:43:45 -07:00
3bc6fc0b77
Fix bug #1666005 and bug #1668994
2017-03-01 21:34:24 -07:00
f68336a49f
Make the settings dialog as small as possible
...
Fixes: https://launchpad.net/bugs/1668669
2017-03-01 17:07:16 -07:00
Tomas Groth
dbdc4a6712
Made to possible to disable chord support completely. Now everything between [ and ] is considered a chord.
2017-02-26 22:14:49 +01:00
phill.ridout@gmail.com
20398c648f
Merge in regenerated resources
...
bzr-revno: 2723
2017-02-26 07:01:30 +00:00
Philip Ridout
76c2ec8b8c
Regened resources
2017-02-25 17:30:39 +00:00
phill.ridout@gmail.com
cf4b9d4fc1
Bible media item refactors.
...
Added the ability to sort the 'select' aka 'advanced' bible books combo box alphabetically. (note resources will need regen to show the button icon, I'll submit this in another merge proposal to keep this one a tiny bit cleaner.
Lots of Tests!
bzr-revno: 2722
2017-02-24 06:51:43 +00:00
Tomas Groth
aac10c5d2c
more chord polish...
2017-02-23 22:40:22 +01:00
Tomas Groth
9c299af567
More chord fixes.
2017-02-22 22:01:42 +01:00
Tomas Groth
37e4a05be7
Fix another test.
2017-02-21 06:17:21 +01:00
Tomas Groth
e40e7920d6
Fix a broken test.
2017-02-20 22:43:18 +01:00
Tomas Groth
d34789cb65
Update to appveyor build script.
2017-02-20 22:25:56 +01:00
Tomas Groth
cec3cf5f96
More chord polishing.
2017-02-20 22:22:17 +01:00
Tomas Groth
3edbcff3ab
trunk
2017-02-19 22:37:07 +01:00
Tomas Groth
32794d7e97
Reintroduced span-based chord html for main and stage view.
2017-02-19 22:35:40 +01:00
f98c2724c9
Add some more tests for ProjectorDB
...
--------------------------------
lp:~alisonken1/openlp/projectordb_tests (revision 2723)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1897/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1808/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1747/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1483/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1073/
[SUCCESS] https://ci.openlp ...
bzr-revno: 2721
2017-02-19 21:25:15 +00:00
Philip Ridout
74382d1466
Added tool tip
2017-02-18 20:22:47 +00:00
Philip Ridout
04c719e807
Dont try to display search results if there are none!
2017-02-18 08:21:19 +00:00
