Samuel Mehrbrodt
5fbcbb3047
Fix test
2017-06-12 20:04:17 +02: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
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
34f8f11efd
Bible tests fixed
2017-06-03 23:34:19 +01: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
Tomas Groth
ad55a8d254
Fix issue where enable-chord settings was not setup correctly for tests.
2017-05-30 22:06:27 +02:00
Philip Ridout
78f38780ce
head
2017-05-26 14:30:54 +01:00
Gary Talent
549ec886a5
Add support for importing EasyWorship 6 databases
...
bzr-revno: 2741
Fixes: https://launchpad.net/bugs/1675641
2017-05-22 12:07:07 -07:00
Tomas Groth
5988f1c56a
Fixed an issue and added a test.
2017-05-17 22:06:45 +02:00
Tomas Groth
798093adfe
trunk
2017-05-11 22:24:20 +02:00
335fed689d
Last few tests with bad imports
2017-05-08 12:04:14 -07:00
Tomas Groth
aa224b9568
Try to workaround windows problems.
2017-04-25 21:52:20 +02:00
baa09a7dd6
Mock comes with Python as of 3.3, and I don't think there is anyone using lower than 3.3, so let's use Python's mock directly now
2017-04-23 22:17:55 -07:00
Tomas Groth
f1b34efcac
More tests.
2017-04-21 21:40:28 +02:00
Tomas Groth
fa9cdc5b94
Added songbeamer chord import test
2017-04-17 21:35:34 +02:00
Tomas Groth
111cff72a1
trunk
2017-04-11 10:05:13 +02:00
Philip Ridout
a3146d7a2c
PEP Fixes
2017-04-03 21:28:16 +01:00
Philip Ridout
53b210d9cd
Changeged 'combined' bible verses and made a seperate 'saved' list
2017-03-31 19:41:38 +01:00
Gary Talent
b4f461c54f
Fix EW6 changes to conform to PEP8.
2017-03-29 16:52:56 -05:00
Gary Talent
5209daab45
Update to trunk.
2017-03-29 16:40:54 -05:00
4183f186ce
Various fixes and things:
...
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
...
bzr-revno: 2728
2017-03-24 19:33:45 -07:00
c3f3b36cd3
Removed some unnecessary comments; Updated changelog
2017-03-22 22:07:16 -07:00
Tomas Groth
31ee3999c0
merge lastest trunk
2017-03-15 20:51:10 +01: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
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
df77c3ebd9
add test
2017-03-04 16:51:51 +00:00
Tim Bentley
0e54621999
test fix
2017-03-04 10:28:07 +00:00
094b1f73bc
Fix a test
2017-03-01 21:43:45 -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
Philip Ridout
162c178d6e
HEAD
2017-02-18 07:23:15 +00:00
Tomas Groth
56d2eaa4c2
trunk
2017-01-25 22:17:27 +01:00
second@tgc.dk
df668fde84
Clean search lyrics for formatting tags. Fixes bug #1655988 .
...
Fix an issue with easyslide import not handling verse order correctly. Fixes bug #1655985 .
Improve the songbeamer encoding detection. Fixes bug #1530597 .
Handle a few videopsalm quirks. Fixes bug #1652851 .
bzr-revno: 2718
2017-01-20 21:42:01 +00:00
Tomas Groth
02ee7ac7dc
Fix an issue with easyslide import not handling verse order correctly.
2017-01-12 22:31:01 +01:00
Olli Suutari
1c2ea31112
- Merged trunk on 8.1.17
2017-01-08 21:12:12 +02:00
Tim Bentley
74ca42e220
Yet another year goes by
2016-12-31 11:01:36 +00:00
Olli Suutari
a9520ced68
- Merged trunk on 23.12.16
2016-12-23 22:16:24 +02:00
Tomas Groth
d1bca6d52a
trunk
2016-12-23 10:14:22 +01:00
Philip Ridout
d9ccd966d8
Pep fixes
2016-12-18 18:47:54 +00:00
Philip Ridout
849bbd2c51
Pep fixes
2016-12-18 18:42:28 +00:00
Philip Ridout
a11e731ab0
Tests
2016-12-18 14:05:10 +00:00
Philip Ridout
61c76c39e6
Tests
2016-12-18 14:01:05 +00:00
3639785151
Fix bug #1642684 by rather just setting the edit text to a blank string
...
Fixes: https://launchpad.net/bugs/1642684
2016-12-15 16:11:42 +02:00
d2e2985229
Add an importer for WordProject bibles, and fix some annoying GUI quirks in wizards.
...
http://forums.openlp.org/discussion/3340/wordproject-format
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/wordproject-importer (revision 2709)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1848/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1759/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1697/
[SUCCESS] https://ci.openlp.io/j ...
bzr-revno: 2708
2016-12-04 07:53:18 +00:00
Olli Suutari
01029c8d65
- Added a test for checking hidden "Written by" text.
2016-12-04 05:08:56 +02:00
Olli Suutari
f3ce137233
- Merged trunk on 4.12.16
2016-12-04 00:48:30 +02:00
Tomas Groth
595fd90d45
Fix some errors on windows
2016-11-29 14:06:54 +01:00
d0ed37e1d5
Move contents of html files into actual html files
2016-11-25 16:17:34 +02:00