Commit Graph

15171 Commits

Author SHA1 Message Date
Olli Suutari
01029c8d65 - Added a test for checking hidden "Written by" text. 2016-12-04 05:08:56 +02:00
Olli Suutari
f45ee8ac17 - Turned the one try statement into multiple so the existing data could be loaded if some fields were missing. 2016-12-04 01:19:08 +02:00
Olli Suutari
f3ce137233 - Merged trunk on 4.12.16 2016-12-04 00:48:30 +02:00
Tomas Groth
19a450fab5 Use the standard packaging repo. 2016-12-01 09:10:51 +01:00
Tomas Groth
105edf36c3 More appveyor adjustments 2016-11-30 21:54:06 +01:00
955fdc50ac Fix bug #1645867 by setting an application attribute related to OpenGL
Fixes: https://launchpad.net/bugs/1645867, https://launchpad.net/bugs/1591749
2016-11-29 23:57:27 +02:00
Tomas Groth
bbda32b949 use revision number for appveyor id 2016-11-29 22:08:32 +01:00
Tomas Groth
1bb2e9e278 Another fix for tests on windows. 2016-11-29 21:57:33 +01:00
Tomas Groth
1f4c8e742e More work on appveyor 2016-11-29 21:37:39 +01:00
ccdc88c4cb Change the name of the help menu to try to fix the double-help-menu problem 2016-11-29 17:44:32 +02:00
Tomas Groth
8595a2171f Another test fix for windows. 2016-11-29 14:54:29 +01:00
Tomas Groth
7017f82b36 Workaround for 7z extraction 2016-11-29 14:17:32 +01:00
Tomas Groth
ceffeae39c Added appveyor conf file. 2016-11-29 14:07:21 +01:00
Tomas Groth
595fd90d45 Fix some errors on windows 2016-11-29 14:06:54 +01:00
ef7f0b1389 Fix pep8 2016-11-25 16:21:27 +02:00
d0ed37e1d5 Move contents of html files into actual html files 2016-11-25 16:17:34 +02:00
846476c4ad Stop wizards from resizing themselves based on the contents of comboboxes 2016-11-25 15:58:33 +02:00
826bfd02dd Add a WordProject Bible importer 2016-11-24 23:48:51 +02:00
second@tgc.dk
20ab44be0f Continuation of lp:~suutari-olli/openlp/bug-fixes-2-4-3
This branch fixes the following bugs:
Bug #1487788: Importing photos does not give focus to OpenLP
Bug #1512040: Loop tooltip gets stuck to "Stop playing..."
Bug #1513490: List of authors uses localized "and" instead of English
Bug #1624661: Missing DB in unmounted disk results in Traceback 

bzr-revno: 2706
2016-11-22 21:34:14 +01:00
Tomas Groth
8275f1139a Change tests to reflect change. 2016-11-21 22:07:01 +01:00
Tomas Groth
b31d5ad08e pep8 fix 2016-11-21 21:56:48 +01:00
Tomas Groth
5e600f4417 Change the text for missing data path text. 2016-11-21 21:21:31 +01:00
Tomas Groth
f83d9ad520 Insert real button label in text to make sure it shows correct text. 2016-11-20 21:24:11 +01:00
Tomas Groth
467d29374d Remove chords from printing. 2016-11-16 20:39:23 +01:00
phill.ridout@gmail.com
f6de30de23 Move the "no results" code in to the list widget.
lp:~phill-ridout/openlp/no-results (revision 2709)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1839/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1750/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1688/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1434/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1024/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_...

bzr-revno: 2705
2016-11-16 00:44:11 +02:00
Tomas Groth
5468def937 pep8 fixes 2016-11-15 22:13:52 +01:00
Tomas Groth
bbc670cc36 trunk 2016-11-15 21:53:50 +01:00
Tim Bentley
3741dca742 check dependancies 2016-11-15 20:39:26 +00:00
Tim Bentley
b1576d0819 Fix bugs and lost images 2016-11-15 20:37:21 +00:00
phill.ridout@gmail.com
1b8a710b16 Move some code in to the searchedit module
lp:~phill-ridout/openlp/search_edit (revision 2705)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1835/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1746/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1684/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1430/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1020/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analys...

bzr-revno: 2704
2016-11-14 14:14:38 +02:00
Philip Ridout
9133c078c7 Pep againbzr pushbzr push 2016-11-12 11:50:06 +00:00
Philip Ridout
f031df3637 Fixed Tests 2016-11-12 11:19:52 +00:00
Philip Ridout
6a3982bab9 Moved over to using UiStrings 2016-11-12 10:00:36 +00:00
Philip Ridout
906f9af54b removed TODO comment 2016-11-12 08:34:55 +00:00
Philip Ridout
9f90b89076 PEP fixes 2016-11-11 21:28:11 +00:00
Philip Ridout
80793f9412 Modified SaveEdit, so that it saves the chosen search type 2016-11-11 21:23:03 +00:00
Philip Ridout
7a2df5eab3 Added test! 2016-11-11 20:50:47 +00:00
Philip Ridout
426cd13fd0 fix if statment 2016-11-11 19:19:59 +00:00
Philip Ridout
94fca706ff Move no results functionality to the ListWidgetWithDnD 2016-11-10 07:09:04 +00:00
Tim Bentley
be556248b8 fix tests 2016-11-06 08:52:15 +00:00
phill.ridout@gmail.com
389fb391df Regenerated resources for my earlier resource clean up merge77
lp:~phill-ridout/openlp/bug1623711-part2 (revision 2703)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1813/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1724/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1662/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1416/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1006/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2703
2016-11-05 14:16:40 +02:00
Tim Bentley
84d7b80ff7 remove dir 2016-11-04 21:24:52 +00:00
Tim Bentley
994c8019a8 missing dir 2016-11-04 21:24:24 +00:00
Tim Bentley
913b2a0654 fix search 2016-11-04 21:24:01 +00:00
Philip Ridout
3d07ec5a09 Regen resources 2016-11-02 19:24:33 +00:00
phill.ridout@gmail.com
09fb235999 lp:~phill-ridout/openlp/bug1623711-2.4 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1806/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1717/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1655/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1411/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1001/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1069/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2702
2016-11-01 21:01:29 +00:00
phill.ridout@gmail.com
f92dbeeb7a Added a script to clean up the resource folder.
Ran script and made some other resource cleanup code changes.


Add this to your merge proposal:
--------------------------------
lp:~phill-ridout/openlp/resource_clean_up (revision 2705)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1803/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1714/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1652/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests...

bzr-revno: 2701
2016-11-01 21:00:24 +00:00
Philip Ridout
053da160a3 Diverged branches? 2016-11-01 19:22:39 +00:00
Philip Ridout
87fede54dc Fixes #1623711* 2016-11-01 19:17:57 +00:00
Philip Ridout
ec19cc5f07 Modified some resources and added test 2016-10-30 08:29:22 +00:00