Commit Graph

16053 Commits

Author SHA1 Message Date
471d5f4608 Merge trunk 2017-07-20 08:27:42 -07:00
f333d8d7a0 Ooops - removed commented code no longer needed 2017-07-12 06:01:46 -07:00
Jonathan Springer
a7daffe54f merge trunk 2017-07-08 09:12:31 -04:00
e277c804f9 Cleanups part 3 2017-07-07 16:43:50 -07:00
virbinarus
67add52c21 I removed the blank spaces from the file.
Allows service items to be expanded and collapsed with the left and right arrow keys.

lp:~virbinarus/openlp/expandserviceitem (revision 2758)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2097/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2007/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1920/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1297/
[[1;32...

bzr-revno: 2752
2017-07-04 16:29:46 -07:00
b83452b2e5 Fix the import path of UiStrings 2017-07-04 16:13:51 -07:00
7c0157ed4b Remove all instances of 'OpenLP 2' and 'OpenLP 2.4' and fix one entry to be more descriptive 2017-07-04 15:30:41 -07:00
d072dd4063 Drop future import comments 2017-06-28 20:19:13 -07:00
44fb799c7a noqa cleanlups 2017-06-28 19:58:08 -07:00
VirBinarus
1ce9a53d3b removed blank lines, split up some test functions for readablilty. 2017-06-27 18:42:54 +01:00
Tim Bentley
77aea3e27a head 2017-06-25 18:04:07 +01:00
Tim Bentley
ffa283f39e fix 2017-06-25 18:03:31 +01:00
0e2019faf2 PJLink update F 2017-06-24 19:21:07 -07:00
VirBinarus
4d6a3ac5d5 formatted test_servicemanager.py even more to make jenkins even more happy 2017-06-22 21:57:36 +01:00
VirBinarus
82b7a568a5 formatted test_servicemanager.py more to make jenkins more happy 2017-06-22 21:49:14 +01:00
VirBinarus
36b965325f formatted test_servicemanager.py to make jenkins happy 2017-06-22 21:42:46 +01:00
VirBinarus
462bc6e051 fixed tests 2017-06-22 21:24:43 +01:00
bd3bedcaf4 -- Fix docstring for pjlink2 db upgrade
-- Add PJLink2 module for UDP socket (skeleton)
-- Move ProjectorManager.projector_list to class attribute
-- Added database_exists check for first time install skip upgrade checks
-- Fix db upgrade for songs
-- Fix db upgrade for songusage
-- Added database_exists from sqlalchemy_utils
-- Added test for skipping upgrade on no db
-- Revert songs db upgrade_7 back to upgrade_6
-- kwargs cleanup

--------------------------------
lp:~alisonken1/openlp/pjli...

bzr-revno: 2751
2017-06-22 17:54:33 +01:00
Tim Bentley
5ec2f001e6 finish download process 2017-06-18 07:03:42 +01:00
Tim Bentley
ee00a74d41 Fix chords and display 2017-06-18 06:21:23 +01:00
Tim Bentley
8a2d043862 load settings on display 2017-06-17 09:51:01 +01:00
d4d556e39d Minor cleanups on kwargs 2017-06-16 17:25:06 -07:00
VirBinarus
26275566ea bzr thinks I've modified it so this is to make sure 2017-06-15 19:10:09 +01:00
VirBinarus
9aef1cdf5d made tests 2017-06-15 19:05:38 +01:00
VirBinarus
524d8f3acb fixed bug #1238385, but no tests
Fixes: https://launchpad.net/bugs/1238385
2017-06-13 16:49:48 +01:00
Samuel Mehrbrodt
af57ef066b Only save footer template if it has been changed 2017-06-13 10:24:55 +02:00
Samuel Mehrbrodt
33e3bcd1d5 Adjust display of available placeholders to mako syntax 2017-06-13 10:17:05 +02:00
Samuel Mehrbrodt
51e644711d Remove blank lines 2017-06-12 22:53:08 +02:00
Samuel Mehrbrodt
f5f4226891 PEP8 fixes 2017-06-12 20:09:50 +02:00
Samuel Mehrbrodt
885a1bad01 Merge trunk 2017-06-12 20:04:49 +02:00
Samuel Mehrbrodt
5fbcbb3047 Fix test 2017-06-12 20:04:17 +02:00
Samuel Mehrbrodt
a1e1092b10 Use Mako instead of Pystache 2017-06-12 19:43:24 +02:00
Tim Bentley
33fe52cae1 tidy ups 2017-06-11 20:41:34 +01:00
Tim Bentley
aa9891612b Add download trace dialog 2017-06-11 18:30:37 +01:00
Tim Bentley
dbea7ed090 refactor plugin apis 2017-06-11 16:24:02 +01:00
Tim Bentley
e0308bfce5 start to change error handling 2017-06-10 11:53:52 +01:00
b0af7fdd2e Revert songs.upgrade, move pjlink_list from class to __init__ 2017-06-09 22:57:00 -07:00
Tim Bentley
be145b7675 handle the version from the web site 2017-06-09 21:53:13 +01:00
Tim Bentley
da51b046b2 Head 2017-06-09 16:56:40 +01:00
Tim Bentley
fbcef30044 settings tab 2017-06-09 16:55:39 +01:00
Phill
1c720ff101 I've TODOne some of the TODO's. As well as some other clean ups
lp:~phill-ridout/openlp/TODOne (revision 2745)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2077/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1987/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1903/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1281/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1131/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/2...

bzr-revno: 2750
2017-06-09 16:55:12 +01:00
79ad031272 Fix missing sqlalchemy exception import 2017-06-09 07:04:52 -07:00
208c1b022f Test for db upgrade skip 2017-06-09 06:45:18 -07:00
4b22def91d More db fixes 2017-06-09 05:12:39 -07:00
Philip Ridout
c0f2a9a777 HEAD 2017-06-09 07:06:49 +01:00
Tim Bentley
93053cd723 get version 2017-06-08 22:36:17 +01:00
Tim Bentley
e7fa46b5f5 move websocket to asynio 2017-06-08 20:56:19 +01:00
Azaziah
80d30bf272 Fixed bugs:
Bug #1639860: Close button is disabled in numerous windows
Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x" instead of "cancel" button and causes traceback on exit
Bug #1666272: Linked audio "next" button results in traceback
Bug #1678292: Space after Bible book name auto-completion is missing
Bug #1694732: wizard sub title does not wrap
Bug #1695268: Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot aft...

bzr-revno: 2749
2017-06-08 19:17:14 +01:00
Johannes Thomas Meyer
e37ef1b74b added SongBook name and Song Number to "Entire Song" Search
lp:~samothjtm/openlp/bug-1695587 (revision 2748)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2076/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1986/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1902/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1280/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1130/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/259...

bzr-revno: 2748
2017-06-08 10:46:14 -07:00
faea1424d8 -- Added openlp.core.lib.projector.upgrade for db version 1
-- Added test class for projector DB upgrade
-- Remove duplicate TEST_DB entry in tests.resources.projector.data
-- Updated TestProjectorDB to use a temporary directory for test db
-- Fix main db update procedure version check (default to version 0 if no version set)
-- Added extra information to projector info popup
-- Restructure valid command dictionary
-- Pep8 in plugins/songusage, plugins/presentations, and core/ui/lib/pathedit....

bzr-revno: 2747
2017-06-08 18:09:55 +01:00