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

16053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Ridout
e248668d1b HEAD 2017-06-06 22:20:01 +01:00
Tim Bentley
1c4f335f23 head without some chords stuff! 2017-06-06 21:58:12 +01:00
Tim Bentley
08a135de78 sort out ftw 2017-06-06 21:45:59 +01:00
Tim Bentley
6d375de3db move deploy and fix tests 2017-06-06 21:35:57 +01:00
Johannes Thomas Meyer
0850351237 implemented fix suggestions 2017-06-05 23:41:29 +02:00
Olli Suutari
48c6810f0c - Added a test for checking that next calls the next playlist item 2017-06-05 21:22:14 +03:00
Olli Suutari
798f3738b8 Value of old last used Bible search type is no longer transferred to settings since it's invalid and gets replaced on boot anyways. 2017-06-05 09:05:54 +03:00
Olli Suutari
a703294db2 - Fixed over idented line on def closeEvent(self, event): 
- Added a comment explaing the ' ' in Bible book name auto completion.
 2017-06-05 08:53:47 +03:00
Olli Suutari
db86f45bd7 Expanded the test_reference_matched_full to include results with dots after numbers, eg. 1. Kings 2017-06-05 05:58:38 +03:00
Olli Suutari
dae544abc1 Improved the regex to check dot after book number and after book name. 2017-06-05 00:22:13 +03:00
Olli Suutari
dd603f6486 Fixed the issue where books with "." can't be used in reference search. 2017-06-04 23:40:18 +03:00
Jonathan Springer
f0d528954d merge trunk 2017-06-04 14:22:58 -04:00
Olli Suutari
8f5b28026a Renamed another wizzard test + comment. 2017-06-04 18:23:30 +03:00
Olli Suutari
191f9c64d8 Renamed test: def test_on_import_click_no_import_wizzard_attr(self): 
to:     def test_on_import_click_no_import_wizard_attr(self):
 2017-06-04 18:22:23 +03:00
Olli Suutari
3918027ff1 - Fixed 2 tests 2017-06-04 18:21:25 +03:00
Olli Suutari
5270b1a716 Fixed the new trailing space added by previous pep fix 2017-06-04 17:46:04 +03:00
Olli Suutari
89856d78b2 two pep8 fixes 2017-06-04 17:30:10 +03:00
Johannes Thomas Meyer
12b540064d merge trunk 2017-06-04 16:18:14 +02:00
Olli Suutari
d247cf2388 Fixed bug: https://bugs.launchpad.net/openlp/+bug/1694732 2017-06-04 17:03:41 +03:00
Samuel Mehrbrodt
ac2f92f8ac Merge trunk 2017-06-04 15:44:20 +02:00
Samuel Mehrbrodt
f89d7992fa PEP8 fixes, cleanup, added two more placeholders for footer template, added last_or_penultimate flag in list 2017-06-04 15:42:21 +02:00
Olli Suutari
731ce0c338 Increased the size of the songmaintancedialogue form for better visual user interface. 2017-06-04 16:20:59 +03:00
Samuel Mehrbrodt
21d1311914 corrected placeholder tags in explanation 2017-06-04 15:10:50 +02:00
Johannes Thomas Meyer
eadabee85e added a placeholder to show the ccli number of a song 2017-06-04 15:10:01 +02:00
Olli Suutari
c135028b46 Fixed bug https://bugs.launchpad.net/openlp/+bug/1666272 
By renaming: self.playerlist.next() to self.playlist.next()
in maindisplay.py derf next(self)
 2017-06-04 15:26:50 +03:00
Olli Suutari
f8b32578f4 Fixed 32 missing "x" buttons for closing windows and forms. (Left it unavailable for bug report.) 2017-06-04 15:14:23 +03:00
Olli Suutari
3ae8caceb0 Added "last search type" to obsolete settings list. 2017-06-04 14:19:19 +03:00
Olli Suutari
c14398b912 Fixed bug: https://bugs.launchpad.net/openlp/+bug/1652559 2017-06-04 13:43:41 +03:00
Olli Suutari
7a27a4adbe Fixed bug #1678292 2017-06-04 13:13:10 +03:00
Olli Suutari
3e70173be4 Renamed "last search type" to "last used search type" 2017-06-04 12:52:15 +03:00
Phill
8ee5c892ad Fixed some bible media item tests and one render test. The 02-Functional tests now pass, but we get a seg fault on the interface-tests 
lp:~phill-ridout/openlp/test-fixes (revision 2748)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2054/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1964/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1888/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1267/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Co...

bzr-revno: 2746
 2017-06-04 08:29:31 +02:00
Johannes Thomas Meyer
0f3d86f0d1 added a placeholder to show the topics of a song 
- and included the empty-description for lists always
 2017-06-04 02:53:33 +02:00
Johannes Thomas Meyer
88642395ee added a placeholder to show the alternate title of a song 
Fixes: https://launchpad.net/bugs/1694430
 2017-06-04 02:42:41 +02:00
Samuel Mehrbrodt
66c9f8eb82 made use of pystache for footer generation being configurable in song settings 
- removed now obsolete and via template better configurable options to display "songbook", "written by" and "copyright" information in footer
- added explanation box for so far used settings as pystache placeholders
- added songs configuration setting for template including reset button
- added default template replacing currently existing configuration as best as possible (should be backwards compatible or at least be adaptable to correspond to former settings)
- adjusted tests to new and removed functionality

Fixes: https://launchpad.net/bugs/1695620
 2017-06-04 01:31:47 +02:00
Philip Ridout
114a2a12a8 fixed some seg faults 2017-06-04 00:27:19 +01:00
Philip Ridout
a3d95acabd and one renderer test 2017-06-03 23:52:11 +01:00
Philip Ridout
34f8f11efd Bible tests fixed 2017-06-03 23:34:19 +01:00
Johannes Thomas Meyer
e6d4857c81 added SongBook name, Song Number and Alternative Title to Entire Search 
Fixes: https://launchpad.net/bugs/1695587
 2017-06-03 12:44:28 +02:00
Ken Roberts
9f8433a18e Merge trunk 2017-06-01 15:36:38 -07:00
Ken Roberts
0fc49e3df1 Translations and more minor cleanups 2017-06-01 15:35:57 -07:00
Philip Ridout
2915a8f0e7 Head 2017-06-01 07:18:47 +01:00
Philip Ridout
5b4bff29fe Logging clean ups 2017-05-31 20:29:43 +01:00
Ken Roberts
80369c8b0b pylint fixes - minor cleanups 2017-05-30 16:26:37 -07:00
Tomas Groth
81492013ed Fixed songshowplus encoding issue. 
Fixed issue where enable-chord settings was not setup correctly for tests.

bzr-revno: 2745
 2017-05-30 22:50:26 +02:00
Tim Bentley
21af845791 Finally got round to finishing the Theme clean up from 2,2! 
Themes now save to JSON and read XML or JSON so fully compatible with 2.4.

Add this to your merge proposal:
--------------------------------
lp:~trb143/openlp/themecleanup (revision 2743)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2036/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1946/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1875/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analy...

bzr-revno: 2744
 2017-05-30 22:48:41 +02:00
Phill
392de6bcde Merged in trunk 
Adds more flexibility to 'locking' bible verses.
fixes #1625681 "If Bible search results are locked, duplicated results are listed"


lp:~phill-ridout/openlp/saved_bible_verses (revision 2746)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2030/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1940/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1871/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1251/
[SUCCESS] https://ci.openlp.io...

bzr-revno: 2743
 2017-05-30 22:45:16 +02:00
Tomas Groth
1dc0b0a4b5 pep8 fixes 2017-05-30 22:15:20 +02:00
Tomas Groth
ad55a8d254 Fix issue where enable-chord settings was not setup correctly for tests. 2017-05-30 22:06:27 +02:00
Tomas Groth
4a3e4e1ad4 Fix songshowplus encoding issue. 2017-05-30 22:05:18 +02:00
Philip Ridout
8b71ff765c PEP 2017-05-30 20:54:30 +01:00